| Submitter | Constantin Musca |
|---|---|
| Date | Sept. 28, 2012, 3:13 p.m. |
| Message ID | <1348845192-28857-1-git-send-email-constantinx.musca@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/37445/ |
| State | Accepted |
| Commit | dbb350b90417962f2da4c1064ab0174badeb0f26 |
| Headers | show |
Comments
On 09/28/2012 08:13 AM, Constantin Musca wrote: > We need to fix the "hosts: files dns mdns4" nsswitch.conf line > because for a .local lookup it does a DNS lookup first which will fail. > The recommended solution is: > hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 > > [YOCTO #2502] > > Signed-off-by: Constantin Musca <constantinx.musca@intel.com> > --- > .../libnss-mdns/libnss-mdns_0.10.bb | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb > index a1f2f9a..f7356e4 100644 > --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb > +++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" > > DEPENDS = "avahi" > RDEPENDS_${PN} = "avahi-daemon" > -PR = "r5" > +PR = "r6" > > SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" > > @@ -24,13 +24,13 @@ DEBIANNAME_${PN} = "libnss-mdns" > EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi" > > pkg_postinst_${PN} () { > -if ! grep -q '^hosts:.*\<mdns4\>' $D/etc/nsswitch.conf; then > - sed -e 's/^hosts:.*/& mdns4/' -i $D/etc/nsswitch.conf > -fi > + sed -e '/^hosts:/s/\s*\<mdns4\>//' \ > + -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns4_minimal [NOTFOUND=return]\3\4 mdns4\5/' \ > + -i $D/etc/nsswitch.conf > } > > pkg_prerm_${PN} () { > -if grep -q '^hosts:.*\<mdns4\>' /etc/nsswitch.conf; then > - sed -e '/^hosts:/s/\s\<mdns4\>//' -i /etc/nsswitch.conf > -fi > + sed -e '/^hosts:/s/\s*\<mdns4\>//' \ > + -e '/^hosts:/s/\s*mdns4_minimal\s\+\[NOTFOUND=return\]//' \ > + -i /etc/nsswitch.conf > } > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb index a1f2f9a..f7356e4 100644 --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "avahi" RDEPENDS_${PN} = "avahi-daemon" -PR = "r5" +PR = "r6" SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" @@ -24,13 +24,13 @@ DEBIANNAME_${PN} = "libnss-mdns" EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi" pkg_postinst_${PN} () { -if ! grep -q '^hosts:.*\<mdns4\>' $D/etc/nsswitch.conf; then - sed -e 's/^hosts:.*/& mdns4/' -i $D/etc/nsswitch.conf -fi + sed -e '/^hosts:/s/\s*\<mdns4\>//' \ + -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns4_minimal [NOTFOUND=return]\3\4 mdns4\5/' \ + -i $D/etc/nsswitch.conf } pkg_prerm_${PN} () { -if grep -q '^hosts:.*\<mdns4\>' /etc/nsswitch.conf; then - sed -e '/^hosts:/s/\s\<mdns4\>//' -i /etc/nsswitch.conf -fi + sed -e '/^hosts:/s/\s*\<mdns4\>//' \ + -e '/^hosts:/s/\s*mdns4_minimal\s\+\[NOTFOUND=return\]//' \ + -i /etc/nsswitch.conf }
We need to fix the "hosts: files dns mdns4" nsswitch.conf line because for a .local lookup it does a DNS lookup first which will fail. The recommended solution is: hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 [YOCTO #2502] Signed-off-by: Constantin Musca <constantinx.musca@intel.com> --- .../libnss-mdns/libnss-mdns_0.10.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)