From 220e40674b2b4bd3a04fc757d167757d124131c0 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 9 Nov 2017 21:09:25 +1000 Subject: 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. (From OE-Core rev: 28547cf01b5ebb81c525a2b982db9b04997d7c4f) Signed-off-by: Nathan Rossi Cc: Andrej Valek Cc: Radovan Scasny Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/busybox') 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 -- cgit v1.2.3-54-g00ecf