busybox: If FEATURE_SUID=y, ship a SUID busybox, bump PR

A number of applets will select FEATURE_SUID, and then not work unless
the busybox binary is SUID.  We switch from a "let the users decide" to
"let the users opt-out".

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen@openembedded.org>

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 5f52850..b165d0f 100644 (file)
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,7 +11,7 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
 
-INC_PR = "r24"
+INC_PR = "r25"
 
 SRC_URI = "\
   file://busybox-cron \
@@ -96,7 +96,11 @@ do_install () {
        # Install /bin/busybox, and the /bin/sh link so the postinst script
        # can run. Let update-alternatives handle the rest.
        install -d ${D}${base_bindir}
-       install -m 0755 ${S}/busybox ${D}${base_bindir}
+       if grep -q "CONFIG_FEATURE_SUID=y" ${WORKDIR}/defconfig; then
+               install -m 4755 ${S}/busybox ${D}${base_bindir}
+       else
+               install -m 0755 ${S}/busybox ${D}${base_bindir}
+       fi
        ln -sf busybox ${D}${base_bindir}/sh
 
        if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then