[OE-core] [PATCH] busybox.inc: Fix bashism in compile, which fixes sh being suid

Nathan Rossi nathan at nathanrossi.com
Thu Nov 9 11:09:25 UTC 2017


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>
---
 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 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
 
-- 
2.14.2





More information about the Openembedded-core mailing list