From patchwork Wed Aug 19 12:05:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1347762 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=A3PTNOxS; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BWmk54M8mz9sRK for ; Wed, 19 Aug 2020 22:07:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B233485B36; Wed, 19 Aug 2020 12:07:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1mVjLdnjjBCV; Wed, 19 Aug 2020 12:07:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C61F685659; Wed, 19 Aug 2020 12:07:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 823651BF33D for ; Wed, 19 Aug 2020 12:07:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7EBB6850AD for ; Wed, 19 Aug 2020 12:07:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pP5cyW_RPeti for ; Wed, 19 Aug 2020 12:07:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CAC0E850A8 for ; Wed, 19 Aug 2020 12:07:15 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id a14so21284029wra.5 for ; Wed, 19 Aug 2020 05:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4FhKi6gbskwt1PQ3d2UIS/BJCRXqrcsXB1yHQbQEB5s=; b=A3PTNOxSRCzHU9xITMtpEQQyt/Ok1VjXqW2MUwCE3s8Sm4Nn5TYV9Shf2oyH2e6L69 ya/rcczFf4FOP5+S+wcKthE3MZf3uMqy5VqzVY7uQ7Z/pv15uvb6ArSk0CUTQByGzAle 7hak6LjBodj1CFRfKco/hSoP0KO3Y5/CNaEx/BjjcPridR3aCMzwWw8uN3mIMS2iLdPo rjo1ixROqRGKl5+LUZpIN9AG8jqN1SM48ygHulN51bjiIsLfHtdGbjtNWWaC6sw4FZ3+ 2MHK9fpjKgrW3WUt1ADCk8i1BcwA8c8EyKfDk1UGzRdSg73DOIgogfiQuf8CtMkN8I9l udXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4FhKi6gbskwt1PQ3d2UIS/BJCRXqrcsXB1yHQbQEB5s=; b=la1aIXPQSn6gC+wfGg8capljWoG/abejOzvyz1g38uk2ShZd9xjMwGnFVst8yiEs8y FXt7ZJuQ0xGAN0pUFuSMAgpByVSfWICWyECGTCfaKKWnVARku5Dl4bj2vEvt6XSMf+dQ KyqgjocMO7dhPS+5rpzwPCPFWDuBOTyEck0SXTOz3QENY8DrTaKeP+QEuPzVcgdHoFeg cjQK/EKUvRgXiJtccXBrckB0sgpZ7RPENzoz9Oa0cYyUGhBjAalfVj9O0yFa9EUCo9Zw 1GGXB8bClGHezVaa5TPLTF2Wbv1LROnWLy8/S8XoJ/VQVG/P13bmCrZenYsx/SBQhGX8 6IbA== X-Gm-Message-State: AOAM533JnYOTUwe6pImoLXuDUsM379ZT+J9QXgQ1haDQmx2M3xNAjSTV 3wG6QFyQPAkkLDia34d37ynfsNrHCJD0v7Fw X-Google-Smtp-Source: ABdhPJxjXpjxfrjq5RSGUZobSuZ0mL94Awh6Z/Oks8xkoT5G7BEBTwgR4DTYQOaL0Nzt3LfeHjAwsg== X-Received: by 2002:adf:f4ca:: with SMTP id h10mr24298761wrp.355.1597838833910; Wed, 19 Aug 2020 05:07:13 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id x82sm5522940wmb.30.2020.08.19.05.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 05:07:13 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Wed, 19 Aug 2020 14:05:06 +0200 Message-Id: <20200819120506.137013-2-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200819120506.137013-1-titouan.christophe@railnova.eu> References: <20200819120506.137013-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/2] package/{collectd, domoticz, shairport-sync}: fix mosquitto dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Thomas Petazzoni , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In 4fc62e1eb6b3adbfc3d3eb7f841275ae8cd1b424, we removed arch/toolchain dependencies from the mosquitto library (MMU, !STATIC, SYNC4), and moved them to the mosquitto broker only. All the packages modified here only need the mosquitto library, so they shouldn't have those depends anymore; but this was never done before. Moreover, domoticz and shairport-sync both use the mosquitto threaded API, so we make them dependent on the newly introduced symbol BR2_PACKAGE_MOSQUITTO_WITH_THREADING. Signed-off-by: Titouan Christophe --- Changes v1 -> v2: * Fix reverse dependencies --- package/collectd/Config.in | 1 - package/domoticz/Config.in | 4 +--- package/shairport-sync/Config.in | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 4f54944cbc..ddf64015bd 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -607,7 +607,6 @@ comment "grpc needs a toolchain w/ C++, gcc >= 4.8" config BR2_PACKAGE_COLLECTD_MQTT bool "mqtt" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto select BR2_PACKAGE_MOSQUITTO help Sends metrics to and/or receives metrics from an MQTT broker. diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index c713ac58b1..545137a087 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_DOMOTICZ bool "domoticz" - depends on BR2_USE_MMU # mosquitto - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto - depends on !BR2_STATIC_LIBS # mosquitto + depends on BR2_PACKAGE_MOSQUITTO_WITH_THREADING depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sleep_for # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in index 528767ba9c..df8a39ceb1 100644 --- a/package/shairport-sync/Config.in +++ b/package/shairport-sync/Config.in @@ -57,6 +57,7 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_MQTT depends on BR2_USE_MMU # avahi depends on BR2_TOOLCHAIN_HAS_THREADS # avahi depends on !BR2_STATIC_LIBS # avahi + depends on BR2_PACKAGE_MOSQUITTO_WITH_THREADING select BR2_PACKAGE_AVAHI select BR2_PACKAGE_AVAHI_DAEMON select BR2_PACKAGE_DBUS