summaryrefslogtreecommitdiffstats
path: root/meta
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-06 10:39:25 +0000
commit2f0bb0cba15e21cbae979524e9621414ae16ae2d (patch)
tree5e10c4649a1d6d9c598898f9395656ac5d738fae /meta
parent44b28954997f62733c09c0f3261d29fe8049916c (diff)
downloadpoky-2f0bb0cba15e21cbae979524e9621414ae16ae2d.tar.gz
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. (From OE-Core rev: 7b5d022e8dd19ee39e084444a32600dc54a3ccc3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 467de32751..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From e58369f6d36bc51eb59d6afa34c1cae3ff0810ef Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 7 Aug 2017 14:10:38 +0300
4Subject: [PATCH] Makefile: build mktables using native gcc
5
6It's a throwaway helper binary used during build, and so it needs to
7be native.
8
9Upstream-Status: Inappropriate [oe specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15Index: git/Makefile
16===================================================================
17--- git.orig/Makefile
18+++ git/Makefile
19@@ -343,7 +343,7 @@ version.h: version.sh version.h.in confi
20
21 mktables: kernel-lib/mktables.c
22 @echo " [CC] $@"
23- $(Q)$(CC) $(CFLAGS) $< -o $@
24+ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
25
26 # the target can be regenerated manually using mktables, but a local copy is
27 # 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 1b4f515cb6..a6ca71d868 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"
16 16
17SRCREV = "6c33832b8c7bf2d7b64d6aed023c0bda43a03311" 17SRCREV = "6c33832b8c7bf2d7b64d6aed023c0bda43a03311"
18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
19 file://0001-Makefile-build-mktables-using-native-gcc.patch \
20 file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \ 19 file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
21 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ 20 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
22 " 21 "