diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-05-26 11:08:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-01 18:34:36 +0100 |
| commit | ab65c7247ff659edabe9f866fd9ca39941265f88 (patch) | |
| tree | f85f61bd61666d9f63f475b50bf63150bcdd986a /meta/recipes-core/busybox/busybox_1.18.4.bb | |
| parent | 505ee4b0a7443c185b101aaa6460d3a566a91fce (diff) | |
| download | poky-ab65c7247ff659edabe9f866fd9ca39941265f88.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)
(From OE-Core rev: 613d0275a59be9154c2a2cdc101bd3e2c79a6d44)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_1.18.4.bb')
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.18.4.bb | 2 |
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 @@ | |||
| 1 | require busybox.inc | 1 | require busybox.inc |
| 2 | PR = "r1" | 2 | PR = "r2" |
| 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 \ |