summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libnss-mdns
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-05-21 16:53:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 08:51:39 +0100
commita3976449abbe231d05ec51747f3d459ff26ba49c (patch)
tree15b8872d1d295e0b439d5c1c7060c15b3715197f /meta/recipes-connectivity/libnss-mdns
parentdd429885189761c264f8d626524c6a02bf148801 (diff)
downloadpoky-a3976449abbe231d05ec51747f3d459ff26ba49c.tar.gz
libnss-mdns: fix postinst scripts
* On upgrade, postinst ocassionally returned 1, so use a conditional instead of &&. * Use sed patterns in order to make it work more generally. (From OE-Core rev: c678d4c42ed0075572c5fad17ca33773ad3f6447) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libnss-mdns')
-rw-r--r--meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb15
1 files changed, 7 insertions, 8 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 87707142d5..a1f2f9ac8e 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"
7 7
8DEPENDS = "avahi" 8DEPENDS = "avahi"
9RDEPENDS_${PN} = "avahi-daemon" 9RDEPENDS_${PN} = "avahi-daemon"
10PR = "r4" 10PR = "r5"
11 11
12SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" 12SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
13 13
@@ -23,15 +23,14 @@ DEBIANNAME_${PN} = "libnss-mdns"
23 23
24EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi" 24EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi"
25 25
26# TODO: pattern based configuration update
27pkg_postinst_${PN} () { 26pkg_postinst_${PN} () {
28 cat $D/etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { 27if ! grep -q '^hosts:.*\<mdns4\>' $D/etc/nsswitch.conf; then
29 sed -i 's/hosts:\s*files dns/& mdns4/' $D/etc/nsswitch.conf 28 sed -e 's/^hosts:.*/& mdns4/' -i $D/etc/nsswitch.conf
30 } 29fi
31} 30}
32 31
33pkg_prerm_${PN} () { 32pkg_prerm_${PN} () {
34 cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns4$" > /dev/null && { 33if grep -q '^hosts:.*\<mdns4\>' /etc/nsswitch.conf; then
35 sed -i 's/\(hosts:\s*files dns\) mdns4*/\1/' /etc/nsswitch.conf 34 sed -e '/^hosts:/s/\s\<mdns4\>//' -i /etc/nsswitch.conf
36 } 35fi
37} 36}