busybox: move su to /bin for lsb command check test
In busybox, util-linux and shadow, su has been moved to /usr/bin/, but lsb cmdchk needs su in /bin. Move su to /bin could fix this issue. [YOCTO#5175] (From OE-Core rev: daff19fe6f0490dc7036602e8b0ca40a23b55556) 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:
parent
bb939628ec
commit
44c65db250
|
@ -1,26 +0,0 @@
|
|||
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
|
||||
|
|
@ -24,7 +24,6 @@ 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 \
|
||||
|
|
Loading…
Reference in New Issue