Patchwork libnss-mdns: fix postinst scripts

login
register
mail settings
Submitter Andreas Oberritter
Date May 21, 2012, 2:53 p.m.
Message ID <1337612033-27237-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/28219/
State Accepted
Commit c678d4c42ed0075572c5fad17ca33773ad3f6447
Headers show

Comments

Andreas Oberritter - May 21, 2012, 2:53 p.m.
* 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(-)
Saul Wold - May 24, 2012, 5:52 p.m.
On 05/21/2012 07:53 AM, Andreas Oberritter wrote:
> * 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
>   }

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 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
 }