diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2013-07-26 20:09:10 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-31 06:56:27 +0100 |
| commit | e01735756a76d27b724b9e7829f78e8a335c1f60 (patch) | |
| tree | 261d037743867e0615b07808355618bfbf6c41cf /meta/recipes-core/busybox | |
| parent | 8d509edcd874e8d43b6fb6c4701c450edbbdef87 (diff) | |
| download | openembedded-core-e01735756a76d27b724b9e7829f78e8a335c1f60.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]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 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 @@ +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 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 \ 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 \ |