diff mbox series

[2/2] dnsmasq: set config dhcp6, broken-rtc by FEATURES

Message ID b8186e721d67ecd786e60137dad30c112ad7e959.1723803452.git.joerg.sommer@navimatix.de
State Accepted
Headers show
Series [1/2] dnsmasq: Install conf example from upstream instead of our version | expand

Commit Message

Jörg Sommer Aug. 16, 2024, 10:17 a.m. UTC 
From: Jörg Sommer <joerg.sommer@navimatix.de>

Some of the PACKAGECONFIG can be derived from the DISTRO_FEATURES and
MACHINE_FEATURES.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
index 30ed463ee..ba783d03f 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
@@ -24,8 +24,13 @@  INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
 
 # dnsmasq defaults
-PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp"
+PACKAGECONFIG ?= "\
+    auth dhcp dumpfile inotify ipset loop script tftp \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'dhcp6', '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '', 'broken-rtc', d)} \
+"
 
+# see src/config.h
 PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH"
 PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC,"
 PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack"