From 4372ec830acc84a51947ad0dba51484977d9e801 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 26 Feb 2010 11:35:32 -0700 Subject: [PATCH] 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 Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi --- recipes/busybox/busybox.inc | 8 ++++++-- 1 file 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 -- 2.39.5