summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
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:03 +0000
commit28547cf01b5ebb81c525a2b982db9b04997d7c4f (patch)
treedb2fdf05808df7c8a76a96b1c63edb8848eed2d3 /meta/recipes-core/busybox
parent3717c76eb24217c14a22f72fdd8732923729dee8 (diff)
downloadopenembedded-core-contrib-28547cf01b5ebb81c525a2b982db9b04997d7c4f.tar.gz
openembedded-core-contrib-28547cf01b5ebb81c525a2b982db9b04997d7c4f.tar.bz2
openembedded-core-contrib-28547cf01b5ebb81c525a2b982db9b04997d7c4f.zip
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>
Diffstat (limited to 'meta/recipes-core/busybox')
-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() {
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