Skip to content

Commit 579755c

Browse files
akiernanrpurdie
authored andcommitted
packagegroup-base: Add option to set zeroconf provider
avahi, systemd-resolved and mDNSResponder (in meta-networking) can all provide Zeroconf services. Add a `ZEROCONF_DAEMON` option to select which of these will provide service via packagegroup-base-zeroconf. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent 60e71fc commit 579755c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

meta/recipes-core/packagegroups/packagegroup-base.bb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,14 @@ RDEPENDS:packagegroup-base-nfs = "\
312312
RRECOMMENDS:packagegroup-base-nfs = "\
313313
kernel-module-nfs "
314314

315+
# Choose 'avahi-daemon', 'mdns' or 'systemd-resolved' as zeroconf-daemon
316+
ZEROCONF_DAEMON ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd-resolved', 'systemd-resolved', 'avahi-daemon', d)}"
315317
SUMMARY:packagegroup-base-zeroconf = "Zeroconf support"
316318
RDEPENDS:packagegroup-base-zeroconf = "\
317-
avahi-daemon"
319+
${@ '' if d.getVar('ZEROCONF_DAEMON') == 'systemd-resolved' else d.getVar('ZEROCONF_DAEMON')} \
320+
"
318321
RDEPENDS:packagegroup-base-zeroconf:append:libc-glibc = "\
319-
libnss-mdns \
322+
${@ {'mdns':'mdns-libnss-mdns','avahi-daemon':'avahi-libnss-mdns','systemd-resolved':''}[d.getVar('ZEROCONF_DAEMON')]} \
320323
"
321324

322325
SUMMARY:packagegroup-base-ipv6 = "IPv6 support"

0 commit comments

Comments
 (0)