[oe-commits] [openembedded-core] branch master updated: busybox.inc: Fix bashism in compile, which fixes sh being suid

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

The following commit(s) were added to refs/heads/master by this push:
     new 28547cf  busybox.inc: Fix bashism in compile, which fixes sh being suid
28547cf is described below

commit 28547cf01b5ebb81c525a2b982db9b04997d7c4f
Author: Nathan Rossi <nathan at nathanrossi.com>
AuthorDate: Thu Nov 9 21:09:25 2017 +1000

    busybox.inc: Fix bashism in compile, which fixes sh being suid
    
    Fix the bashism in the suid check. This ensures that the check works
    correctly on hosts that default sh to e.g. dash. If this check fails the
    suid shell workaround does not remove sh from the suid binary and
    results in the target system containing a busybox.suid with sh as well
    as /bin/sh -> /bin/busybox.suid.
    
    Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
    Cc: Andrej Valek <andrej.valek at siemens.com>
    Cc: Radovan Scasny <radovan.scasny at siemens.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/busybox/busybox.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 86f0c60..4012f92 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -173,7 +173,7 @@ do_compile() {
 			done > .config.app.$s
 
 			# workaround for suid bug 10346
-			if [ "$s" == "suid" ] ; then
+			if [ "$s" = "suid" ] ; then
 				sed "s/.*CONFIG_SH_IS_NONE.*$/CONFIG_SH_IS_NONE=y/" -i .config.app.suid
 			fi
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.