diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-01-22 10:39:46 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 11:21:56 +0000 |
| commit | fa282186d82e8fe3c590d4ea79e464116e5ceea2 (patch) | |
| tree | eb19131a90c0d817bde9ff6f12057092a6df6493 /meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch | |
| parent | ee4061b43522c4893b41c3be63d06be1ee7e3c70 (diff) | |
| download | openembedded-core-contrib-fa282186d82e8fe3c590d4ea79e464116e5ceea2.tar.gz | |
busybox: upgrade to stable 1.22.1
Upgrade busybox to the stable release 1.22.1.
During this upgrade, 9 patches are removed. Reasons are detailed below.
The following 6 patches are removed as they have been merged.
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
The following three patches are removed because they are mainly about moving
binaries from /bin to /usr/bin to make the update-alternative work correctly
at rootfs time. We can easily solve this problem by changing recipes. There's
no compelling reason why such patches are needed.
meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
meta/recipes-core/busybox/busybox/stat-usr-bin.patch
meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch')
| -rw-r--r-- | meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch deleted file mode 100644 index e8e1edfb7e..0000000000 --- a/meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Sat, 24 Mar 2012 17:36:48 +0100 -Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with - procps - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - include/applets.src.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/applets.src.h b/include/applets.src.h -index 87d9cbb..c148a8c 100644 ---- a/include/applets.src.h -+++ b/include/applets.src.h -@@ -404,7 +404,7 @@ IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) - IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP)) - /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */ - IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) --IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP)) -+IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP)) - IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP)) --- -1.7.5.4 - |