diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2016-03-21 14:03:55 +0100 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2016-03-21 14:03:55 +0100 |
| commit | e71e6db6585f34dbab2ac4645801528614d7e274 (patch) | |
| tree | 4edb3fd6bfc63d6c2dccc0fc843618a4c28018d3 /meta-linaro-integration | |
| parent | 367f784b831938dc508b7d472342d2d0d6ed9769 (diff) | |
busybox: drop patch
This doesn't apply anymore and doesn't seem to be needed either.
Change-Id: Iebc7760254bc1b6ea5e3fe06c57601fd82537a06
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'meta-linaro-integration')
| -rw-r--r-- | meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend | 2 | ||||
| -rw-r--r-- | meta-linaro-integration/recipes-core/busybox/files/0002-Revert-Passthrough-r-to-linker.patch | 27 |
2 files changed, 1 insertions, 28 deletions
diff --git a/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend b/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend index 2cf20bb..c71028c 100644 --- a/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend +++ b/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://linaro.cfg \ - file://0002-Revert-Passthrough-r-to-linker.patch " + " diff --git a/meta-linaro-integration/recipes-core/busybox/files/0002-Revert-Passthrough-r-to-linker.patch b/meta-linaro-integration/recipes-core/busybox/files/0002-Revert-Passthrough-r-to-linker.patch deleted file mode 100644 index 3e92ad5..0000000 --- a/meta-linaro-integration/recipes-core/busybox/files/0002-Revert-Passthrough-r-to-linker.patch +++ /dev/null @@ -1,27 +0,0 @@ -From df2cc76cdebc4773361477f3db203790f6986e3b Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Sat, 22 Aug 2015 23:42:40 -0700 -Subject: Revert Passthrough -r to linker - ---- -Upstream-Status: Pending - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9da02cb..10dd4a9 100644 ---- a/Makefile -+++ b/Makefile -@@ -309,7 +309,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C - MODFLAGS = -DMODULE - CFLAGS_MODULE = $(MODFLAGS) - AFLAGS_MODULE = $(MODFLAGS) --LDFLAGS_RELOCATABLE = -Xlinker -r -nostdlib -+LDFLAGS_RELOCATABLE = -r -nostdlib - LDFLAGS_MODULE = $(LDFLAGS_RELOCATABLE) - CFLAGS_KERNEL = - AFLAGS_KERNEL = --- -2.1.4 - |