From a3976449abbe231d05ec51747f3d459ff26ba49c Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 21 May 2012 16:53:53 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb') 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" DEPENDS = "avahi" RDEPENDS_${PN} = "avahi-daemon" -PR = "r4" +PR = "r5" SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" @@ -23,15 +23,14 @@ DEBIANNAME_${PN} = "libnss-mdns" EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi" -# TODO: pattern based configuration update pkg_postinst_${PN} () { - cat $D/etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { - sed -i 's/hosts:\s*files dns/& mdns4/' $D/etc/nsswitch.conf - } +if ! grep -q '^hosts:.*\' $D/etc/nsswitch.conf; then + sed -e 's/^hosts:.*/& mdns4/' -i $D/etc/nsswitch.conf +fi } pkg_prerm_${PN} () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns4$" > /dev/null && { - sed -i 's/\(hosts:\s*files dns\) mdns4*/\1/' /etc/nsswitch.conf - } +if grep -q '^hosts:.*\' /etc/nsswitch.conf; then + sed -e '/^hosts:/s/\s\//' -i /etc/nsswitch.conf +fi } -- cgit v1.2.3-54-g00ecf