summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch32
-rw-r--r--meta/recipes-core/busybox/busybox_1.24.1.bb1
-rw-r--r--meta/recipes-core/busybox/busybox_git.bb9
3 files changed, 7 insertions, 35 deletions
diff --git a/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch b/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch
deleted file mode 100644
index de286fb746..0000000000
--- a/meta/recipes-core/busybox/busybox/0002-Passthrough-r-to-linker.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From df2cc76cdebc4773361477f3db203790f6986e3b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 22 Aug 2015 23:42:40 -0700
4Subject: [PATCH 2/2] Passthrough -r to linker
5
6clang does not have -r switch and it does not pass it down to linker
7either, LDFLAGS_RELOCATABLE is used when CC is used for LD, so this
8should not cause side effects
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile b/Makefile
18index 9da02cb..10dd4a9 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -309,7 +309,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C
22 MODFLAGS = -DMODULE
23 CFLAGS_MODULE = $(MODFLAGS)
24 AFLAGS_MODULE = $(MODFLAGS)
25-LDFLAGS_RELOCATABLE = -r -nostdlib
26+LDFLAGS_RELOCATABLE = -Xlinker -r -nostdlib
27 LDFLAGS_MODULE = $(LDFLAGS_RELOCATABLE)
28 CFLAGS_KERNEL =
29 AFLAGS_KERNEL =
30--
312.1.4
32
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb
index 174ca472cd..bdaa5a5640 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -29,7 +29,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
29 file://recognize_connmand.patch \ 29 file://recognize_connmand.patch \
30 file://busybox-cross-menuconfig.patch \ 30 file://busybox-cross-menuconfig.patch \
31 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ 31 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
32 file://0002-Passthrough-r-to-linker.patch \
33 file://busybox-1.24.1-unzip.patch \ 32 file://busybox-1.24.1-unzip.patch \
34 file://busybox-1.24.1-unzip-regression.patch \ 33 file://busybox-1.24.1-unzip-regression.patch \
35 file://busybox-1.24.1-truncate-open-mode.patch \ 34 file://busybox-1.24.1-truncate-open-mode.patch \
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 @@
1require busybox.inc 1require busybox.inc
2 2
3SRCREV = "966423d4034067f52b419570a1016d1dfc4aeacd" 3SRCREV = "1b7c17391de66502dd7a97c866e0a33681edbb1f"
4# Lookout for PV bump too when SRCREV is changed 4# Lookout for PV bump too when SRCREV is changed
5PV = "1.25.0+git${SRCPV}" 5PV = "1.25.0+git${SRCPV}"
6 6
@@ -35,12 +35,17 @@ SRC_URI = "git://busybox.net/busybox.git \
35 file://recognize_connmand.patch \ 35 file://recognize_connmand.patch \
36 file://busybox-cross-menuconfig.patch \ 36 file://busybox-cross-menuconfig.patch \
37 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ 37 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
38 file://0002-Passthrough-r-to-linker.patch \
39 file://mount-via-label.cfg \ 38 file://mount-via-label.cfg \
40 file://sha1sum.cfg \ 39 file://sha1sum.cfg \
41 file://sha256sum.cfg \ 40 file://sha256sum.cfg \
42 file://getopts.cfg \ 41 file://getopts.cfg \
43 file://resize.cfg \ 42 file://resize.cfg \
43 ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'busybox')]} \
44 ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager', True) == 'busybox-mdev')]} \
45 file://inittab \
46 file://rcS \
47 file://rcK \
48 file://runlevel \
44" 49"
45SRC_URI_append_libc-musl = " file://musl.cfg " 50SRC_URI_append_libc-musl = " file://musl.cfg "
46 51