From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mga09.intel.com ([134.134.136.24])
	by linuxtogo.org with esmtp (Exim 4.72)
	(envelope-from <sgw@linux.intel.com>) id 1SXcMs-0007Jh-4N
	for openembedded-core@lists.openembedded.org;
	Thu, 24 May 2012 20:02:34 +0200
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga102.jf.intel.com with ESMTP; 24 May 2012 10:52:21 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="148039614"
Received: from unknown (HELO [10.255.12.24]) ([10.255.12.24])
	by orsmga002.jf.intel.com with ESMTP; 24 May 2012 10:52:21 -0700
Message-ID: <4FBE7555.4000908@linux.intel.com>
Date: Thu, 24 May 2012 10:52:21 -0700
From: Saul Wold <sgw@linux.intel.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:12.0) Gecko/20120430 Thunderbird/12.0.1
MIME-Version: 1.0
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
References: <1337612033-27237-1-git-send-email-obi@opendreambox.org>
In-Reply-To: <1337612033-27237-1-git-send-email-obi@opendreambox.org>
Subject: Re: [PATCH] libnss-mdns: fix postinst scripts
X-BeenThere: openembedded-core@lists.openembedded.org
X-Mailman-Version: 2.1.11
Precedence: list
Reply-To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
List-Id: Patches and discussions about the oe-core layer
	<openembedded-core.lists.openembedded.org>
List-Unsubscribe: <http://lists.linuxtogo.org/cgi-bin/mailman/options/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=unsubscribe>
List-Archive: <http://lists.linuxtogo.org/pipermail/openembedded-core>
List-Post: <mailto:openembedded-core@lists.openembedded.org>
List-Help: <mailto:openembedded-core-request@lists.openembedded.org?subject=help>
List-Subscribe: <http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=subscribe>
X-List-Received-Date: Thu, 24 May 2012 18:02:34 -0000
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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!