summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox_1.18.4.bb
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-05-26 11:08:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-01 18:32:29 +0100
commit613d0275a59be9154c2a2cdc101bd3e2c79a6d44 (patch)
tree1b2f44b35cec200ab43d1b88ae10505b4c302122 /meta/recipes-core/busybox/busybox_1.18.4.bb
parent16bbeb2d866a07abd5379d1de30f2b747e1693fe (diff)
downloadopenembedded-core-613d0275a59be9154c2a2cdc101bd3e2c79a6d44.tar.gz
busybox: sync do_install() with oe master (mostly)
This is basically a backport of the current state of the art from the openembedded master repo. In particular this fixes an installation error on micro: | + cp -dPr /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/bin /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/sbin /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/ | cp: will not create hard link `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/image/bin' to directory `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/bin' | cp: cannot copy a directory, `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image', into itself, `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/image' | ERROR: Function 'do_install' failed (see /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/temp/log.do_install.3808 for further information) Signed-off-by: Phil Blundell <philb@gnu.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_1.18.4.bb')
-rw-r--r--meta/recipes-core/busybox/busybox_1.18.4.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index cf3765075c..a5080d5a47 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \