From 1b5c52f2e81087be704fa6527f9d08f27a62ab09 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 24 Mar 2012 20:46:47 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox_1.19.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/busybox/busybox_1.19.4.bb') 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 \ -- cgit v1.2.3-54-g00ecf