diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-03-12 14:29:48 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 07:44:01 +0000 |
| commit | e617b6f9bf0aa3f1a7a19019f6953d0a102f3039 (patch) | |
| tree | 60d352dbb7e4f7be7cd01bec650570f47fa9609b /meta/recipes-core/busybox/busybox_git.bb | |
| parent | 06ab1c7f60fbc0a9aebb9fd9321a1b7213378037 (diff) | |
| download | openembedded-core-contrib-e617b6f9bf0aa3f1a7a19019f6953d0a102f3039.tar.gz | |
busybox: Drop -r passthrough patch
This was added to help clang compile busybox but since then
the option has been added to llvm and now we have upgraded clang
to 3.8 which has this option available
Fix git recipe to build with mdev feature and update to tip when here
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_git.bb')
| -rw-r--r-- | meta/recipes-core/busybox/busybox_git.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index ae16b5935a..c29b894349 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb @@ -1,6 +1,6 @@ require busybox.inc -SRCREV = "966423d4034067f52b419570a1016d1dfc4aeacd" +SRCREV = "1b7c17391de66502dd7a97c866e0a33681edbb1f" # Lookout for PV bump too when SRCREV is changed PV = "1.25.0+git${SRCPV}" @@ -35,12 +35,17 @@ SRC_URI = "git://busybox.net/busybox.git \ file://recognize_connmand.patch \ file://busybox-cross-menuconfig.patch \ file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ - file://0002-Passthrough-r-to-linker.patch \ file://mount-via-label.cfg \ file://sha1sum.cfg \ file://sha256sum.cfg \ file://getopts.cfg \ file://resize.cfg \ + ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'busybox')]} \ + ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager', True) == 'busybox-mdev')]} \ + file://inittab \ + file://rcS \ + file://rcK \ + file://runlevel \ " SRC_URI_append_libc-musl = " file://musl.cfg " |