diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2025-02-01 17:28:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-05 12:49:55 +0000 |
commit | 7a42e31654a32955da904ec86585a87f188d1998 (patch) | |
tree | f6661ed6a826922fe2f02e597b019cd6c4d64f1e /meta | |
parent | e4e77b1f374f5d27d9f3dd231b7e929713ff8fb4 (diff) | |
download | poky-7a42e31654a32955da904ec86585a87f188d1998.tar.gz |
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.
(From OE-Core rev: f9d10d6ac4b2a081d110ab58e7137aedddd960cb)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/distro_alias.inc | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb (renamed from meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.15.1.bb) | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 5000b08eb8..a938c007e8 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" | |||
13 | DISTRO_PN_ALIAS:pn-alsa-utils-alsaconf = "OE-Core" | 13 | DISTRO_PN_ALIAS:pn-alsa-utils-alsaconf = "OE-Core" |
14 | DISTRO_PN_ALIAS:pn-alsa-utils-scripts = "OE-Core" | 14 | DISTRO_PN_ALIAS:pn-alsa-utils-scripts = "OE-Core" |
15 | DISTRO_PN_ALIAS:pn-atk = "Fedora=atk OpenSuSE=atk" | 15 | DISTRO_PN_ALIAS:pn-atk = "Fedora=atk OpenSuSE=atk" |
16 | DISTRO_PN_ALIAS:pn-avahi-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" | ||
16 | DISTRO_PN_ALIAS:pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" | 17 | DISTRO_PN_ALIAS:pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" |
17 | DISTRO_PN_ALIAS:pn-babeltrace = "OSPDT" | 18 | DISTRO_PN_ALIAS:pn-babeltrace = "OSPDT" |
18 | DISTRO_PN_ALIAS:pn-babeltrace2 = "OSPDT" | 19 | DISTRO_PN_ALIAS:pn-babeltrace2 = "OSPDT" |
@@ -147,7 +148,6 @@ DISTRO_PN_ALIAS:pn-libksba = "Fedora=libksba Debian=libksba8 Ubuntu=libksba" | |||
147 | DISTRO_PN_ALIAS:pn-libmatchbox = "Ubuntu=libmatchbox Fedora=libmatchbox" | 148 | DISTRO_PN_ALIAS:pn-libmatchbox = "Ubuntu=libmatchbox Fedora=libmatchbox" |
148 | DISTRO_PN_ALIAS:pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2" | 149 | DISTRO_PN_ALIAS:pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2" |
149 | DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" | 150 | DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" |
150 | DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" | ||
151 | DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" | 151 | DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" |
152 | DISTRO_PN_ALIAS:pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" | 152 | DISTRO_PN_ALIAS:pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" |
153 | DISTRO_PN_ALIAS:pn-libpcre = "Mandriva=libpcre0 Fedora=pcre" | 153 | 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 6e3cb54a1f..bec55a7c1c 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 <liezhi.yang@windriver.com>" | |||
52 | RECIPE_MAINTAINER:pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>" | 52 | RECIPE_MAINTAINER:pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>" |
53 | RECIPE_MAINTAINER:pn-automake = "Robert Yang <liezhi.yang@windriver.com>" | 53 | RECIPE_MAINTAINER:pn-automake = "Robert Yang <liezhi.yang@windriver.com>" |
54 | RECIPE_MAINTAINER:pn-avahi = "Yi Zhao <yi.zhao@windriver.com>" | 54 | RECIPE_MAINTAINER:pn-avahi = "Yi Zhao <yi.zhao@windriver.com>" |
55 | RECIPE_MAINTAINER:pn-avahi-libnss-mdns = "Unassigned <unassigned@yoctoproject.org>" | ||
55 | RECIPE_MAINTAINER:pn-babeltrace = "Unassigned <unassigned@yoctoproject.org>" | 56 | RECIPE_MAINTAINER:pn-babeltrace = "Unassigned <unassigned@yoctoproject.org>" |
56 | RECIPE_MAINTAINER:pn-babeltrace2 = "Unassigned <unassigned@yoctoproject.org>" | 57 | RECIPE_MAINTAINER:pn-babeltrace2 = "Unassigned <unassigned@yoctoproject.org>" |
57 | RECIPE_MAINTAINER:pn-barebox = "Enrico Jörns <yocto@pengutronix.de>" | 58 | RECIPE_MAINTAINER:pn-barebox = "Enrico Jörns <yocto@pengutronix.de>" |
@@ -364,7 +365,6 @@ RECIPE_MAINTAINER:pn-libmodulemd = "Unassigned <unassigned@yoctoproject.org>" | |||
364 | RECIPE_MAINTAINER:pn-libnl = "Unassigned <unassigned@yoctoproject.org>" | 365 | RECIPE_MAINTAINER:pn-libnl = "Unassigned <unassigned@yoctoproject.org>" |
365 | RECIPE_MAINTAINER:pn-libnotify = "Anuj Mittal <anuj.mittal@intel.com>" | 366 | RECIPE_MAINTAINER:pn-libnotify = "Anuj Mittal <anuj.mittal@intel.com>" |
366 | RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj <raj.khem@gmail.com>" | 367 | RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj <raj.khem@gmail.com>" |
367 | RECIPE_MAINTAINER:pn-libnss-mdns = "Unassigned <unassigned@yoctoproject.org>" | ||
368 | RECIPE_MAINTAINER:pn-libnss-nis = "Khem Raj <raj.khem@gmail.com>" | 368 | RECIPE_MAINTAINER:pn-libnss-nis = "Khem Raj <raj.khem@gmail.com>" |
369 | RECIPE_MAINTAINER:pn-libogg = "Anuj Mittal <anuj.mittal@intel.com>" | 369 | RECIPE_MAINTAINER:pn-libogg = "Anuj Mittal <anuj.mittal@intel.com>" |
370 | RECIPE_MAINTAINER:pn-libpam = "Anuj Mittal <anuj.mittal@intel.com>" | 370 | RECIPE_MAINTAINER:pn-libpam = "Anuj Mittal <anuj.mittal@intel.com>" |
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 index 0db609fc47..9b8275b113 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' | |||
22 | EXTRA_OECONF = "--libdir=${base_libdir}" | 22 | EXTRA_OECONF = "--libdir=${base_libdir}" |
23 | 23 | ||
24 | RDEPENDS:${PN} = "avahi-daemon" | 24 | RDEPENDS:${PN} = "avahi-daemon" |
25 | RPROVIDES:${PN} = "libnss-mdns" | ||
25 | 26 | ||
26 | pkg_postinst:${PN} () { | 27 | pkg_postinst:${PN} () { |
27 | sed ' | 28 | sed ' |