summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-07 16:10:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:38 +0100
commit9952b38de4002da66da677380ac86283f852ad22 (patch)
tree0b4dd29156fbc58a98d7fdcad25c2c084c6882c7 /meta
parent62455dfb8aabd5106f6316ef3fc93fc4116da17c (diff)
downloadpoky-9952b38de4002da66da677380ac86283f852ad22.tar.gz
btrfs-tools: update to 4.12
Add a patch to force a native build for a helper binary (which is not installed or used outside of the build process). (From OE-Core rev: 35e3ed68fd25941e3d76e5a063299b1d1cee0e70) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> 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.patch30
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb)6
2 files changed, 34 insertions, 2 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
new file mode 100644
index 0000000000..a81900ee7e
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
@@ -0,0 +1,30 @@
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
15diff --git a/Makefile b/Makefile
16index b3e2b63..347aaf1 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -323,7 +323,7 @@ version.h: version.sh version.h.in configure.ac
20
21 mktables: kernel-lib/mktables.c
22 @echo " [CC] $@"
23- $(Q)$(CC) $(CFLAGS) $< -o $@
24+ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
25
26 kernel-lib/tables.c: mktables
27 @echo " [TABLE] $@"
28--
292.13.2
30
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb
index a7b42e9546..c3cc89c2b0 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb
@@ -14,8 +14,10 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl"
14DEPENDS_append_class-target = " udev" 14DEPENDS_append_class-target = " udev"
15RDEPENDS_${PN} = "libgcc" 15RDEPENDS_${PN} = "libgcc"
16 16
17SRCREV = "88221fc081a7a0979a012f243b66cf097382cc8f" 17SRCREV = "0607132c3200bcead1426e6dc685432008de95de"
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 "
19 21
20inherit autotools-brokensep pkgconfig manpages 22inherit autotools-brokensep pkgconfig manpages
21 23