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:01:50 +0100 |
| commit | fa8b2d2bed63fa4fc2af45f094998b0f9e69d272 (patch) | |
| tree | 58ea93d7f53d2f63b790860caabb12bbfc28deda /meta/recipes-core/busybox/busybox_1.19.4.bb | |
| parent | 246438582f8a23ce1847bae230bce07fbb3c6d15 (diff) | |
| download | openembedded-core-fa8b2d2bed63fa4fc2af45f094998b0f9e69d272.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
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 @@ 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 \ |