summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-11-09 21:09:25 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-09 11:49:07 +0000
commit220e40674b2b4bd3a04fc757d167757d124131c0 (patch)
tree0d2fa4aa32bbe062d46b7e5360805fe94277e858 /meta/recipes-core
parentb656fd9267b1f36d46ca20a1c0bcfaedbf7df438 (diff)
downloadpoky-220e40674b2b4bd3a04fc757d167757d124131c0.tar.gz
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 <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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
1 files changed, 1 insertions, 1 deletions
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() {
173 done > .config.app.$s 173 done > .config.app.$s
174 174
175 # workaround for suid bug 10346 175 # workaround for suid bug 10346
176 if [ "$s" == "suid" ] ; then 176 if [ "$s" = "suid" ] ; then
177 sed "s/.*CONFIG_SH_IS_NONE.*$/CONFIG_SH_IS_NONE=y/" -i .config.app.suid 177 sed "s/.*CONFIG_SH_IS_NONE.*$/CONFIG_SH_IS_NONE=y/" -i .config.app.suid
178 fi 178 fi
179 179