From e71e6db6585f34dbab2ac4645801528614d7e274 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 21 Mar 2016 14:03:55 +0100 Subject: busybox: drop patch This doesn't apply anymore and doesn't seem to be needed either. Change-Id: Iebc7760254bc1b6ea5e3fe06c57601fd82537a06 Signed-off-by: Koen Kooi --- .../recipes-core/busybox/busybox_%.bbappend | 2 +- .../0002-Revert-Passthrough-r-to-linker.patch | 27 ---------------------- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 meta-linaro-integration/recipes-core/busybox/files/0002-Revert-Passthrough-r-to-linker.patch (limited to 'meta-linaro-integration') 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 -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 - -- cgit v1.2.3