sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia 2013-07-26 20:09:10 +08:00 committed by Richard Purdie
parent 9ed0a318b6
commit 16ce101c3f
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch Normal file
View File

@ -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 <hongxu.jia@windriver.com>
---
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

1
meta/recipes-core/busybox/busybox_1.21.1.bb
View File

@ -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 \