From 35e3ed68fd25941e3d76e5a063299b1d1cee0e70 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 7 Aug 2017 16:10:42 +0300 Subject: 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). Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...-Makefile-build-mktables-using-native-gcc.patch | 30 +++++++++++++++++++ .../btrfs-tools/btrfs-tools_4.11.1.bb | 33 -------------------- .../btrfs-tools/btrfs-tools_4.12.bb | 35 ++++++++++++++++++++++ 3 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb 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 @@ +From e58369f6d36bc51eb59d6afa34c1cae3ff0810ef Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b3e2b63..347aaf1 100644 +--- a/Makefile ++++ b/Makefile +@@ -323,7 +323,7 @@ version.h: version.sh version.h.in configure.ac + + mktables: kernel-lib/mktables.c + @echo " [CC] $@" +- $(Q)$(CC) $(CFLAGS) $< -o $@ ++ $(Q)$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ + + kernel-lib/tables.c: mktables + @echo " [TABLE] $@" +-- +2.13.2 + diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb deleted file mode 100644 index a7b42e9546..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.11.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Checksumming Copy on Write Filesystem utilities" -DESCRIPTION = "Btrfs is a new copy on write filesystem for Linux aimed at \ -implementing advanced features while focusing on fault tolerance, repair and \ -easy administration. \ -This package contains utilities (mkfs, fsck, btrfsctl) used to work with \ -btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." - -HOMEPAGE = "https://btrfs.wiki.kernel.org" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" -SECTION = "base" -DEPENDS = "util-linux attr e2fsprogs lzo acl" -DEPENDS_append_class-target = " udev" -RDEPENDS_${PN} = "libgcc" - -SRCREV = "88221fc081a7a0979a012f243b66cf097382cc8f" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" - -inherit autotools-brokensep pkgconfig manpages - -PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" -EXTRA_OECONF_append_libc-musl = " --disable-backtrace " - -do_configure_prepend() { - # Upstream doesn't ship this and autoreconf won't install it as automake isn't used. - mkdir -p ${S}/config - cp -f $(automake --print-libdir)/install-sh ${S}/config/ -} - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb new file mode 100644 index 0000000000..c3cc89c2b0 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb @@ -0,0 +1,35 @@ +SUMMARY = "Checksumming Copy on Write Filesystem utilities" +DESCRIPTION = "Btrfs is a new copy on write filesystem for Linux aimed at \ +implementing advanced features while focusing on fault tolerance, repair and \ +easy administration. \ +This package contains utilities (mkfs, fsck, btrfsctl) used to work with \ +btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." + +HOMEPAGE = "https://btrfs.wiki.kernel.org" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" +SECTION = "base" +DEPENDS = "util-linux attr e2fsprogs lzo acl" +DEPENDS_append_class-target = " udev" +RDEPENDS_${PN} = "libgcc" + +SRCREV = "0607132c3200bcead1426e6dc685432008de95de" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ + file://0001-Makefile-build-mktables-using-native-gcc.patch \ + " + +inherit autotools-brokensep pkgconfig manpages + +PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, asciidoc-native xmlto-native" +EXTRA_OECONF_append_libc-musl = " --disable-backtrace " + +do_configure_prepend() { + # Upstream doesn't ship this and autoreconf won't install it as automake isn't used. + mkdir -p ${S}/config + cp -f $(automake --print-libdir)/install-sh ${S}/config/ +} + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg