diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-24 20:46:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-26 12:13:04 +0100 |
commit | 1b5c52f2e81087be704fa6527f9d08f27a62ab09 (patch) | |
tree | fc050c8ba7f695c1e9a830eb81df560d8d9736e9 /meta/recipes-core/busybox/busybox_1.19.4.bb | |
parent | aff0f018d20d9a2b05a55fc173c89fbedd7f97ee (diff) | |
download | poky-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/busybox_1.19.4.bb')
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.4.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r0" | 2 | PR = "r1" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_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 \ |