[Buildroot] [git commit branch/2020.05.x] package/{collectd, domoticz}: fix outdated dependencies for mosquitto

Peter Korsgaard peter at korsgaard.com
Sat Aug 29 17:51:31 UTC 2020


commit: https://git.buildroot.net/buildroot/commit/?id=c4618cdb80b332efe67c33a4cd0a95600056ee1d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.05.x

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.

Signed-off-by: Titouan Christophe <titouan.christophe at railnova.eu>
[Peter: leave mmu/!static dependency for domoticz as it uses fork()/looks
	for libmosquitto.so]
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
(cherry picked from commit 8f5a9f597e35e6bc89dc938edbe753004d0201d1)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/collectd/Config.in | 1 -
 package/domoticz/Config.in | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 771beced85..5b13ed436b 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -587,7 +587,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..1ed2d63520 100644
--- a/package/domoticz/Config.in
+++ b/package/domoticz/Config.in
@@ -1,8 +1,7 @@
 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_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sleep_for
 	# pthread_condattr_setclock
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL



More information about the buildroot mailing list