diff options
| author | Tom Rini <tom_rini@mentor.com> | 2010-02-26 11:35:32 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-02-26 11:35:32 -0700 |
| commit | 4372ec830acc84a51947ad0dba51484977d9e801 (patch) | |
| tree | b9c20f65c5d50c8a32fd2285fcb4caf320421752 | |
| parent | 0da188d1ae9fa082c986178f299b7fdcf0223240 (diff) | |
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>
| -rw-r--r-- | recipes/busybox/busybox.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 5f5285043b..b165d0f34a 100644 --- 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 |