diff options
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 48910ca33a..86f0c60249 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -156,6 +156,12 @@ do_compile() { cp .config .config.orig oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid + + # workaround for suid bug 10346 + if ! grep -q "CONFIG_SH_IS_NONE" busybox.cfg.nosuid; then + echo "CONFIG_SH_IS_NONE" >> busybox.cfg.suid + fi + for i in `cat busybox.cfg.suid busybox.cfg.nosuid`; do echo "# $i is not set" >> .config.disable.apps done @@ -165,6 +171,12 @@ do_compile() { cat busybox.cfg.$s | while read item; do grep -w "$item" .config.orig done > .config.app.$s + + # workaround for suid bug 10346 + if [ "$s" == "suid" ] ; then + sed "s/.*CONFIG_SH_IS_NONE.*$/CONFIG_SH_IS_NONE=y/" -i .config.app.suid + fi + merge_config.sh -m .config.nonapps .config.app.$s oe_runmake busybox_unstripped mv busybox_unstripped busybox.$s @@ -204,7 +216,7 @@ do_install () { install -m 0755 ${B}/busybox.nosuid ${D}${base_bindir} install -m 0644 ${S}/busybox.links.suid ${D}${sysconfdir} install -m 0644 ${S}/busybox.links.nosuid ${D}${sysconfdir} - if grep -q "CONFIG_FEATURE_SH_IS_ASH=y" ${B}/.config; then + if grep -q "CONFIG_SH_IS_ASH=y" ${B}/.config; then ln -sf busybox.nosuid ${D}${base_bindir}/sh fi # Keep a default busybox for people who want to invoke busybox directly. @@ -218,7 +230,7 @@ do_install () { install -m 0755 ${B}/busybox ${D}${base_bindir} fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir} - if grep -q "CONFIG_FEATURE_SH_IS_ASH=y" ${B}/.config; then + if grep -q "CONFIG_SH_IS_ASH=y" ${B}/.config; then ln -sf busybox ${D}${base_bindir}/sh fi # We make this symlink here to eliminate the error when upgrading together |