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>

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 @@
+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
+
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 @@
 require busybox.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://get_header_tar.patch \
            file://busybox-appletlib-dependency.patch \
            file://run-parts.in.usr-bin.patch \
+           file://watch.in.usr-bin.patch \
            file://busybox-udhcpc-no_deconfig.patch \
            file://find-touchscreen.sh \
            file://busybox-cron \