From 44c65db2501e153ab6836736f7b281e8061f1ffa Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 13 Sep 2013 08:06:08 +0000 Subject: 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 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 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch (limited to 'meta') 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 deleted file mode 100644 index 0d5b55842a..0000000000 --- a/meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch +++ /dev/null @@ -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 ---- - 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 f766beec03..5c0527397e 100644 --- a/meta/recipes-core/busybox/busybox_1.21.1.bb +++ b/meta/recipes-core/busybox/busybox_1.21.1.bb @@ -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 \ -- cgit v1.2.3-54-g00ecf