From f9d10d6ac4b2a081d110ab58e7137aedddd960cb Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sat, 1 Feb 2025 17:28:43 +0000 Subject: [PATCH] nss-mdns: Rename recipe to avahi-libnss-mdns meta-networking has Apple's mDNSResponder which also delivers libnss-mdns nsswitch plugin. Rename this recipe to avahi-libss-mdns and add an RPROVIDE so that either than be chosen. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 2 +- meta/conf/distro/include/maintainers.inc | 2 +- .../libnss-mdns_0.15.1.bb => avahi/avahi-libnss-mdns_0.15.1.bb} | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/{libnss-mdns/libnss-mdns_0.15.1.bb => avahi/avahi-libnss-mdns_0.15.1.bb} (97%) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 5000b08eb83..a938c007e8a 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -13,6 +13,7 @@ DISTRO_PN_ALIAS:pn-alsa-state = "OE-Core" DISTRO_PN_ALIAS:pn-alsa-utils-alsaconf = "OE-Core" DISTRO_PN_ALIAS:pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS:pn-atk = "Fedora=atk OpenSuSE=atk" +DISTRO_PN_ALIAS:pn-avahi-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" DISTRO_PN_ALIAS:pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS:pn-babeltrace = "OSPDT" DISTRO_PN_ALIAS:pn-babeltrace2 = "OSPDT" @@ -147,7 +148,6 @@ DISTRO_PN_ALIAS:pn-libksba = "Fedora=libksba Debian=libksba8 Ubuntu=libksba" DISTRO_PN_ALIAS:pn-libmatchbox = "Ubuntu=libmatchbox Fedora=libmatchbox" DISTRO_PN_ALIAS:pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2" DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" -DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" DISTRO_PN_ALIAS:pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" DISTRO_PN_ALIAS:pn-libpcre = "Mandriva=libpcre0 Fedora=pcre" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 6e3cb54a1fb..bec55a7c1c9 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -52,6 +52,7 @@ RECIPE_MAINTAINER:pn-autoconf = "Robert Yang " RECIPE_MAINTAINER:pn-autoconf-archive = "Robert Yang " RECIPE_MAINTAINER:pn-automake = "Robert Yang " RECIPE_MAINTAINER:pn-avahi = "Yi Zhao " +RECIPE_MAINTAINER:pn-avahi-libnss-mdns = "Unassigned " RECIPE_MAINTAINER:pn-babeltrace = "Unassigned " RECIPE_MAINTAINER:pn-babeltrace2 = "Unassigned " RECIPE_MAINTAINER:pn-barebox = "Enrico Jörns " @@ -364,7 +365,6 @@ RECIPE_MAINTAINER:pn-libmodulemd = "Unassigned " RECIPE_MAINTAINER:pn-libnl = "Unassigned " RECIPE_MAINTAINER:pn-libnotify = "Anuj Mittal " RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj " -RECIPE_MAINTAINER:pn-libnss-mdns = "Unassigned " RECIPE_MAINTAINER:pn-libnss-nis = "Khem Raj " RECIPE_MAINTAINER:pn-libogg = "Anuj Mittal " RECIPE_MAINTAINER:pn-libpam = "Anuj Mittal " diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb b/meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb similarity index 97% rename from meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb rename to meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb index 0db609fc473..9b8275b1138 100644 --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb +++ b/meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb @@ -22,6 +22,7 @@ COMPATIBLE_HOST:libc-musl = 'null' EXTRA_OECONF = "--libdir=${base_libdir}" RDEPENDS:${PN} = "avahi-daemon" +RPROVIDES:${PN} = "libnss-mdns" pkg_postinst:${PN} () { sed ' -- 2.47.3