From a4482a44de4e9d43c4af306f1cbff20a54f54bd5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 26 Jul 2013 20:09:10 +0800 Subject: [PATCH] busybox: move /bin/su to /usr/bin/su to match util-linux and shadow Both of util-linux and shadow have su binary in /usr/bin, fix busybox to use the same path so they can be properly tracked by alternatives. [YOCTO #4926] (From OE-Core rev: e01735756a76d27b724b9e7829f78e8a335c1f60) Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../busybox/busybox-1.21.1/su-usr-bin.patch | 26 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.21.1.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch diff --git a/meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch new file mode 100644 index 0000000..0d5b558 --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch @@ -0,0 +1,26 @@ +busybox: move /bin/su to /usr/bin/su to match util-linux and shadow + +Both of util-linux and shadow have su binary in /usr/bin, fix busybox +to use the same path so they can be properly tracked by alternatives. + +Upstream-Status: Inappropriate [embedded] +Signed-off-by: Hongxu Jia +--- + include/applets.src.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/applets.src.h b/include/applets.src.h +--- a/include/applets.src.h ++++ b/include/applets.src.h +@@ -349,7 +349,7 @@ IF_STAT(APPLET(stat, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP)) + /* Needs to be run by root or be suid root - needs to change uid and gid: */ +-IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE)) ++IF_SU(APPLET(su, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) + IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP)) + IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP)) +-- +1.8.1.2 + diff --git a/meta/recipes-core/busybox/busybox_1.21.1.bb b/meta/recipes-core/busybox/busybox_1.21.1.bb index d702f7e..fdb1974 100644 --- a/meta/recipes-core/busybox/busybox_1.21.1.bb +++ b/meta/recipes-core/busybox/busybox_1.21.1.bb @@ -22,6 +22,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://umount.busybox \ file://defconfig \ file://stat-usr-bin.patch \ + file://su-usr-bin.patch \ file://busybox-syslog.service.in \ file://busybox-klogd.service.in \ file://testsuite-du-du-k-works-fix-false-positive.patch \ -- 2.7.4