[meta-swupd][PATCH 1/2] oe-swupd-helpers: convert scripts to posix shell

[meta-swupd][PATCH 1/2] oe-swupd-helpers: convert scripts to posix shell

[André Draszik]

From: André Draszik <adraszik@tycoint.com>

These scripts don't do much and there's no reason for
them to require bash as interpreter.

Signed-off-by: André Draszik <adraszik@tycoint.com>
---
 recipes-core/swupd-client/oe-swupd-helpers/clr_pre_update.sh      | 2 +-
 recipes-core/swupd-client/oe-swupd-helpers/kernel_updater.sh      | 2 +-
 recipes-core/swupd-client/oe-swupd-helpers/systemdboot_updater.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-core/swupd-client/oe-swupd-helpers/clr_pre_update.sh b/recipes-core/swupd-client/oe-swupd-helpers/clr_pre_update.sh
index 6302090..835948d 100755
--- a/recipes-core/swupd-client/oe-swupd-helpers/clr_pre_update.sh
+++ b/recipes-core/swupd-client/oe-swupd-helpers/clr_pre_update.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -u
 
 #######################################
diff --git a/recipes-core/swupd-client/oe-swupd-helpers/kernel_updater.sh b/recipes-core/swupd-client/oe-swupd-helpers/kernel_updater.sh
index b0d5335..98e12c2 100755
--- a/recipes-core/swupd-client/oe-swupd-helpers/kernel_updater.sh
+++ b/recipes-core/swupd-client/oe-swupd-helpers/kernel_updater.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #######################################
 # This script will be called after an updated kernel has been installed
diff --git a/recipes-core/swupd-client/oe-swupd-helpers/systemdboot_updater.sh b/recipes-core/swupd-client/oe-swupd-helpers/systemdboot_updater.sh
index 470cd6e..19f025d 100755
--- a/recipes-core/swupd-client/oe-swupd-helpers/systemdboot_updater.sh
+++ b/recipes-core/swupd-client/oe-swupd-helpers/systemdboot_updater.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #######################################
 # systemd bootloader installer
-- 
2.10.2

[meta-swupd][PATCH 2/2] swupd-client: don't unconditionally depend on bash

[André Draszik]

From: André Draszik <adraszik@tycoint.com>

The swupd client itself does not depend on bash anymore since
version 3.3.0. Any posix shell is fine. So let's move the
runtime dependency to the appropriate place.

If some layer's oe-swupd-helpers.bbappend does introduce
a bash dependency, it should just state that dependency
itself.

As the shell now be provided by bash or busybox, also add
an appropriate entry to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS.

Signed-off-by: André Draszik <adraszik@tycoint.com>
---
 conf/layer.conf                                | 1 +
 recipes-core/swupd-client/oe-swupd-helpers.bb  | 3 +--
 recipes-core/swupd-client/swupd-client_2.87.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 2998949..50e7558 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -13,4 +13,5 @@ LAYERVERSION_meta-swupd = "1"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
   oe-swupd-helpers->bash \
+  oe-swupd-helpers->busybox \
 "
diff --git a/recipes-core/swupd-client/oe-swupd-helpers.bb b/recipes-core/swupd-client/oe-swupd-helpers.bb
index 4690f21..9a5a8dd 100644
--- a/recipes-core/swupd-client/oe-swupd-helpers.bb
+++ b/recipes-core/swupd-client/oe-swupd-helpers.bb
@@ -35,5 +35,4 @@ do_install () {
     done
 }
 
-RDEPENDS_${PN} += "bash"
-FILES_${PN} += "${systemd_system_unitdir}"
\ No newline at end of file
+FILES_${PN} += "${systemd_system_unitdir}"
diff --git a/recipes-core/swupd-client/swupd-client_2.87.bb b/recipes-core/swupd-client/swupd-client_2.87.bb
index 96e7a10..09d09a4 100644
--- a/recipes-core/swupd-client/swupd-client_2.87.bb
+++ b/recipes-core/swupd-client/swupd-client_2.87.bb
@@ -24,7 +24,7 @@ SRC_URI[md5sum] = "5d272c62edb8a9c576005ac5e1182ea3"
 SRC_URI[sha256sum] = "45df259a7dc2fed985ee9961e112120fc46670dd75476c3262fc6804b1c66fb8"
 
 DEPENDS = "glib-2.0 curl openssl libarchive"
-RDEPENDS_${PN}_append_class-target = " oe-swupd-helpers bsdtar"
+RDEPENDS_${PN}_append_class-target = " oe-swupd-helpers bash bsdtar"
 # We check /etc/os-release for the current OS version number
 RRECOMMENDS_${PN}_class-target = "os-release"
 
-- 
2.10.2

Re: [meta-swupd][PATCH 2/2] swupd-client: don't unconditionally depend on bash

[Patrick Ohly]

On Mon, 2016-11-21 at 16:29 +0000, André Draszik wrote:
> The swupd client itself does not depend on bash anymore since
> version 3.3.0. Any posix shell is fine. So let's move the
> runtime dependency to the appropriate place.
> 
> If some layer's oe-swupd-helpers.bbappend does introduce
> a bash dependency, it should just state that dependency
> itself.
> 
> As the shell now be provided by bash or busybox, also add
> an appropriate entry to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS.

Makes sense, I'll submit soon.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.

Re: [meta-swupd][PATCH 1/2] oe-swupd-helpers: convert scripts to posix shell

[Patrick Ohly]

On Mon, 2016-11-21 at 16:29 +0000, André Draszik wrote:
> These scripts don't do much and there's no reason for
> them to require bash as interpreter.

Makes sense, I'll submit soon.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.