aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-04 21:58:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-05 22:27:22 +0000
commit7b5d022e8dd19ee39e084444a32600dc54a3ccc3 (patch)
treedfce8d81317b6c98810995a78db5f1c2ec2bba59
parente37a1ecc292b684daa49f2da2e19e0aa975f0959 (diff)
downloadopenembedded-core-contrib-7b5d022e8dd19ee39e084444a32600dc54a3ccc3.tar.gz
openembedded-core-contrib-7b5d022e8dd19ee39e084444a32600dc54a3ccc3.tar.bz2
openembedded-core-contrib-7b5d022e8dd19ee39e084444a32600dc54a3ccc3.zip
btrfs-tools: remove redundant cross-compilation patch
This patch was to use BUILD_CC instead of CC when building mktables, a binary used to generate tables.c. However due to cross-compilation problems such as this, upstream since 4.12.1 (f929b62 specifically) avoids the entire issue and ships tables.c in the repository, updating it as required. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch27
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb1
2 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
deleted file mode 100644
index 467de327515..00000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e58369f6d36bc51eb59d6afa34c1cae3ff0810ef Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 7 Aug 2017 14:10:38 +0300
-Subject: [PATCH] Makefile: build mktables using native gcc
-
-It's a throwaway helper binary used during build, and so it needs to
-be native.
-
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -343,7 +343,7 @@ version.h: version.sh version.h.in confi
-
- mktables: kernel-lib/mktables.c
- @echo " [CC] $@"
-- $(Q)$(CC) $(CFLAGS) $< -o $@
-+ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-
- # the target can be regenerated manually using mktables, but a local copy is
- # kept so the build process is simpler
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb
index 1b4f515cb62..a6ca71d8689 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb
@@ -16,7 +16,6 @@ RDEPENDS_${PN} = "libgcc"
SRCREV = "6c33832b8c7bf2d7b64d6aed023c0bda43a03311"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
- file://0001-Makefile-build-mktables-using-native-gcc.patch \
file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
"