btrfs-tools: remove redundant cross-compilation patch
PATCH 1/2 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 <[email protected]>
--- ...-Makefile-build-mktables-using-native-gcc.patch | 27 ---------------------- .../btrfs-tools/btrfs-tools_4.20.1.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From e58369f6d36bc51eb59d6afa34c1cae3ff0810ef Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -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 <[email protected]> ---- - 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
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb +0 -1
@@ -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 \ "
Signature · 1 line
2.11.0
PATCH 2/2 btrfs-tools: pass V=1 to get verbose builds
Quiet builds are nice for interactive builds, but hide information we'd like in the logs.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.20.1.bb +1 -0
@@ -27,6 +27,7 @@ CLEANBROKEN = "1" PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" EXTRA_OECONF = " --disable-zstd" EXTRA_OECONF_append_libc-musl = " --disable-backtrace " +EXTRA_OEMAKE = "V=1" do_configure_prepend() { # Upstream doesn't ship this and autoreconf won't install it as automake isn't used.
Signature · 1 line
2.11.0