diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-07-05 10:29:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch) | |
tree | cde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch | |
parent | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff) | |
download | poky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz |
busybox: upgrade to stable 1.21.1
Merged or backported patches are dropped.
The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's
about the -P option behavior, and it's not accepted, so I dropped
this patch too.
(From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f)
Signed-off-by: Chen Qi <Qi.Chen@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/busybox-1.21.1/watch.in.usr-bin.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch new file mode 100644 index 0000000000..e8e1edfb7e --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001 | ||
4 | From: Andreas Oberritter <obi@opendreambox.org> | ||
5 | Date: Sat, 24 Mar 2012 17:36:48 +0100 | ||
6 | Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with | ||
7 | procps | ||
8 | |||
9 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
10 | --- | ||
11 | include/applets.src.h | 2 +- | ||
12 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/include/applets.src.h b/include/applets.src.h | ||
15 | index 87d9cbb..c148a8c 100644 | ||
16 | --- a/include/applets.src.h | ||
17 | +++ b/include/applets.src.h | ||
18 | @@ -404,7 +404,7 @@ IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) | ||
19 | IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
20 | /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */ | ||
21 | IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) | ||
22 | -IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP)) | ||
23 | +IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
24 | IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP)) | ||
25 | IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
26 | IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
27 | -- | ||
28 | 1.7.5.4 | ||
29 | |||