summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-07-26 20:09:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-31 06:59:58 +0100
commit16ce101c3f9b43ba329b6e57ee0c658907da6138 (patch)
tree3e88ed1c1cbbf7982d52233b1a2d7e389d95a8d8 /meta/recipes-core
parent9ed0a318b6f11849f54a632ac49d9f69c026d1c6 (diff)
downloadpoky-16ce101c3f9b43ba329b6e57ee0c658907da6138.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch26
-rw-r--r--meta/recipes-core/busybox/busybox_1.21.1.bb1
2 files changed, 27 insertions, 0 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
new file mode 100644
index 0000000000..0d5b55842a
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.21.1/su-usr-bin.patch
@@ -0,0 +1,26 @@
1busybox: move /bin/su to /usr/bin/su to match util-linux and shadow
2
3Both of util-linux and shadow have su binary in /usr/bin, fix busybox
4to use the same path so they can be properly tracked by alternatives.
5
6Upstream-Status: Inappropriate [embedded]
7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8---
9 include/applets.src.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/include/applets.src.h b/include/applets.src.h
13--- a/include/applets.src.h
14+++ b/include/applets.src.h
15@@ -349,7 +349,7 @@ IF_STAT(APPLET(stat, BB_DIR_USR_BIN, BB_SUID_DROP))
16 IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
17 IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
18 /* Needs to be run by root or be suid root - needs to change uid and gid: */
19-IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
20+IF_SU(APPLET(su, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
21 IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP))
22 IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP))
23 IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP))
24--
251.8.1.2
26
diff --git a/meta/recipes-core/busybox/busybox_1.21.1.bb b/meta/recipes-core/busybox/busybox_1.21.1.bb
index d702f7e61d..fdb1974c91 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 \
22 file://umount.busybox \ 22 file://umount.busybox \
23 file://defconfig \ 23 file://defconfig \
24 file://stat-usr-bin.patch \ 24 file://stat-usr-bin.patch \
25 file://su-usr-bin.patch \
25 file://busybox-syslog.service.in \ 26 file://busybox-syslog.service.in \
26 file://busybox-klogd.service.in \ 27 file://busybox-klogd.service.in \
27 file://testsuite-du-du-k-works-fix-false-positive.patch \ 28 file://testsuite-du-du-k-works-fix-false-positive.patch \