diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-09-13 08:06:08 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 19:24:34 +0100 |
| commit | daff19fe6f0490dc7036602e8b0ca40a23b55556 (patch) | |
| tree | a7f5de5dd70f47ea1e62695c1478fadf09bbe1ee /meta/recipes-core/busybox | |
| parent | a343c32891aa46a7f7d5f0cc6d1266a387900dad (diff) | |
| download | openembedded-core-daff19fe6f0490dc7036602e8b0ca40a23b55556.tar.gz openembedded-core-daff19fe6f0490dc7036602e8b0ca40a23b55556.tar.bz2 openembedded-core-daff19fe6f0490dc7036602e8b0ca40a23b55556.zip | |
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]
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>
Diffstat (limited to 'meta/recipes-core/busybox')
| -rw-r--r-- | meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.21.1.bb | 1 |
2 files changed, 0 insertions, 27 deletions
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 <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 - 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 \ |