From: Andreas Oberritter <obi@opendreambox.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] libnss-mdns: fix postinst scripts
Date: Mon, 21 May 2012 16:53:53 +0200 [thread overview]
Message-ID: <1337612033-27237-1-git-send-email-obi@opendreambox.org> (raw)
* 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>
---
.../libnss-mdns/libnss-mdns_0.10.bb | 15 +++++++--------
1 file 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 8770714..a1f2f9a 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
}
--
1.7.9.5
next reply other threads:[~2012-05-21 15:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 14:53 Andreas Oberritter [this message]
2012-05-24 17:52 ` [PATCH] libnss-mdns: fix postinst scripts Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337612033-27237-1-git-send-email-obi@opendreambox.org \
--to=obi@opendreambox.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox