summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-24 20:46:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-26 12:13:04 +0100
commit1b5c52f2e81087be704fa6527f9d08f27a62ab09 (patch)
treefc050c8ba7f695c1e9a830eb81df560d8d9736e9 /meta/recipes-core/busybox
parentaff0f018d20d9a2b05a55fc173c89fbedd7f97ee (diff)
downloadpoky-1b5c52f2e81087be704fa6527f9d08f27a62ab09.tar.gz
busybox: move watch to /usr/bin for compatibility with procps
Commit 68dc2a3fa30c03a196d650de34d0c657a7b85454 broke opkg upgrade: | update-alternatives: Error: cannot register alternative watch to | /usr/bin/watch since it is already registered to /bin/watch (From OE-Core rev: fa8b2d2bed63fa4fc2af45f094998b0f9e69d272) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch29
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb3
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch
new file mode 100644
index 0000000000..e8e1edfb7e
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch
@@ -0,0 +1,29 @@
1Upstream-Status: Inappropriate [configuration]
2
3From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001
4From: Andreas Oberritter <obi@opendreambox.org>
5Date: Sat, 24 Mar 2012 17:36:48 +0100
6Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with
7 procps
8
9Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
10---
11 include/applets.src.h | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/include/applets.src.h b/include/applets.src.h
15index 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--
281.7.5.4
29
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index dff616de27..3f226699fd 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r0" 2PR = "r1"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
8 file://get_header_tar.patch \ 8 file://get_header_tar.patch \
9 file://busybox-appletlib-dependency.patch \ 9 file://busybox-appletlib-dependency.patch \
10 file://run-parts.in.usr-bin.patch \ 10 file://run-parts.in.usr-bin.patch \
11 file://watch.in.usr-bin.patch \
11 file://busybox-udhcpc-no_deconfig.patch \ 12 file://busybox-udhcpc-no_deconfig.patch \
12 file://find-touchscreen.sh \ 13 file://find-touchscreen.sh \
13 file://busybox-cron \ 14 file://busybox-cron \