diff options
| -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 @@ | |||
| 1 | busybox: move /bin/su to /usr/bin/su to match util-linux and shadow | ||
| 2 | |||
| 3 | Both of util-linux and shadow have su binary in /usr/bin, fix busybox | ||
| 4 | to use the same path so they can be properly tracked by alternatives. | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [embedded] | ||
| 7 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 8 | --- | ||
| 9 | include/applets.src.h | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --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 | -- | ||
| 25 | 1.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 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 \ | |||
| 24 | file://umount.busybox \ | 24 | file://umount.busybox \ |
| 25 | file://defconfig \ | 25 | file://defconfig \ |
| 26 | file://stat-usr-bin.patch \ | 26 | file://stat-usr-bin.patch \ |
| 27 | file://su-usr-bin.patch \ | ||
| 28 | file://busybox-syslog.service.in \ | 27 | file://busybox-syslog.service.in \ |
| 29 | file://busybox-klogd.service.in \ | 28 | file://busybox-klogd.service.in \ |
| 30 | file://testsuite-du-du-k-works-fix-false-positive.patch \ | 29 | file://testsuite-du-du-k-works-fix-false-positive.patch \ |
