diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-05-21 16:53:53 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-24 08:34:50 +0100 |
| commit | c678d4c42ed0075572c5fad17ca33773ad3f6447 (patch) | |
| tree | 6a083a8ef976da51bd2d6c1d49195a760c6c2b2d | |
| parent | ba1539f165470d6ee9b7b95b5067792e384e6aea (diff) | |
| download | openembedded-core-c678d4c42ed0075572c5fad17ca33773ad3f6447.tar.gz openembedded-core-c678d4c42ed0075572c5fad17ca33773ad3f6447.tar.bz2 openembedded-core-c678d4c42ed0075572c5fad17ca33773ad3f6447.zip | |
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.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb | 15 |
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" 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:.*\<mdns4\>' $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:.*\<mdns4\>' /etc/nsswitch.conf; then + sed -e '/^hosts:/s/\s\<mdns4\>//' -i /etc/nsswitch.conf +fi } |