From 0ad477bb9202701a0b3b776d873cd5899a84f2aa Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sat, 1 Feb 2025 17:02:44 +0000 Subject: [PATCH] mdns: Separate out mdns-libnss-mdns package Extract mdns-libnss-mdns from the main package so we can mark it as an RPROVIDE for libnss-mdns (matching avahi-libnss-mdns) and then RRECOMMEND this when building with glibc. Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- .../recipes-protocols/mdns/mdns_2559.60.39.0.1.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-protocols/mdns/mdns_2559.60.39.0.1.bb b/meta-networking/recipes-protocols/mdns/mdns_2559.60.39.0.1.bb index b860c34e88..97d3597cff 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2559.60.39.0.1.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2559.60.39.0.1.bb @@ -112,7 +112,7 @@ do_install () { install mdnsd.sh ${D}${INIT_D_DIR}/mdns } -pkg_postinst:${PN} () { +pkg_postinst:${PN}-libnss-mdns () { if [ -r $D${sysconfdir}/nsswitch.conf ]; then sed -e '/^hosts:/s/\s*\//' \ -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 mdns\3\4\5/' \ @@ -120,7 +120,7 @@ pkg_postinst:${PN} () { fi } -pkg_prerm:${PN} () { +pkg_prerm:${PN}-libnss-mdns () { if [ -r $D${sysconfdir}/nsswitch.conf ]; then sed -e '/^hosts:/s/\s*\//' \ -e '/^hosts:/s/\s*mdns//' \ @@ -131,7 +131,12 @@ pkg_prerm:${PN} () { SYSTEMD_SERVICE:${PN} = "mdns.service" INITSCRIPT_NAME = "mdns" +PACKAGE_BEFORE_PN = "${PN}-libnss-mdns" + +RRECOMMENDS:${PN}:append:libc-glibc = " ${PN}-libnss-mdns" + FILES_SOLIBSDEV = "${libdir}/libdns_sd.so" -FILES:${PN} += "${libdir}/libnss_mdns-0.2.so" +FILES:${PN}-libnss-mdns = "${sysconfdir}/nss_mdns.conf ${libdir}/libnss_mdns*.so*" +RPROVIDES:${PN}-libnss-mdns = "libnss-mdns" RPROVIDES:${PN} += "libdns-sd"