From: Nathan Rossi <nathan@nathanrossi.com>
Date: Thu, 9 Nov 2017 11:09:25 +0000 (+1000)
Subject: busybox.inc: Fix bashism in compile, which fixes sh being suid
X-Git-Tag: uninative-1.8~1210
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=28547cf01b5ebb81c525a2b982db9b04997d7c4f;p=openembedded-core.git

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@nathanrossi.com>
Cc: Andrej Valek <andrej.valek@siemens.com>
Cc: Radovan Scasny <radovan.scasny@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 86f0c60249..4012f921c6 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