Patchwork wpa-supplicant-2.0: don't exit in pkg_postinst

login
register
mail settings
Submitter Alexandre Belloni
Date Jan. 16, 2014, 1:34 p.m.
Message ID <1389879279-28203-1-git-send-email-alexandre.belloni@free-electrons.com>
Download mbox | patch
Permalink /patch/64961/
State Accepted
Commit cac6f8148a88d072636bc1f9d54fed6de80dcb6d
Headers show

Comments

Alexandre Belloni - Jan. 16, 2014, 1:34 p.m.
Exiting explicitly in pkg_postinst makes it impossible to use the
update-rc.d class in a .bbappend because the link creation is appended
to the pkg_postinst script.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
Alexandre Belloni - Jan. 29, 2014, 1:06 p.m.
Ping ?

On Thu, Jan 16, 2014 at 14:34:39 +0100, Alexandre Belloni wrote :
> Exiting explicitly in pkg_postinst makes it impossible to use the
> update-rc.d class in a .bbappend because the link creation is appended
> to the pkg_postinst script.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>  meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
> index ce669a1ffa4f..ba28c6bd4528 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
> @@ -82,9 +82,8 @@ do_install () {
>  
>  pkg_postinst_wpa-supplicant () {
>  	# If we're offline, we don't need to do this.
> -	if [ "x$D" != "x" ]; then
> -		exit 0
> +	if [ "x$D" = "x" ]; then
> +		killall -q -HUP dbus-daemon || true
>  	fi
>  
> -	killall -q -HUP dbus-daemon || true
>  }
> -- 
> 1.8.3.2
>
Richard Purdie - Jan. 29, 2014, 5:41 p.m.
On Wed, 2014-01-29 at 14:06 +0100, Alexandre Belloni wrote:
> Ping ?

Merged 10 days ago:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=cac6f8148a88d072636bc1f9d54fed6de80dcb6d

Cheers,

Richard
Alexandre Belloni - Jan. 29, 2014, 6:46 p.m.
Oh right, I didn't get any notifications so I assumed nobody had a look
at it.

Thanks !

On 29/01/2014 at 17:41:42 +0000, Richard Purdie wrote :
> On Wed, 2014-01-29 at 14:06 +0100, Alexandre Belloni wrote:
> > Ping ?
> 
> Merged 10 days ago:
> 
> http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=cac6f8148a88d072636bc1f9d54fed6de80dcb6d
> 
> Cheers,
> 
> Richard
>

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index ce669a1ffa4f..ba28c6bd4528 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -82,9 +82,8 @@  do_install () {
 
 pkg_postinst_wpa-supplicant () {
 	# If we're offline, we don't need to do this.
-	if [ "x$D" != "x" ]; then
-		exit 0
+	if [ "x$D" = "x" ]; then
+		killall -q -HUP dbus-daemon || true
 	fi
 
-	killall -q -HUP dbus-daemon || true
 }