diff options
Diffstat (limited to 'poky/meta/recipes-devtools/btrfs-tools')
3 files changed, 92 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch new file mode 100644 index 000000000..790676b9c --- /dev/null +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch @@ -0,0 +1,26 @@ +From bc35c4caebb57cc8b96c30c25432b12ca8dc18d5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 6 Oct 2017 15:03:49 +0300 +Subject: [PATCH] Fix build with musl (missing header include for dev_t). + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + convert/source-fs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/convert/source-fs.h b/convert/source-fs.h +index 23f3356..6fd770f 100644 +--- a/convert/source-fs.h ++++ b/convert/source-fs.h +@@ -20,6 +20,7 @@ + #include "kerncompat.h" + #include <linux/kdev_t.h> + #include <pthread.h> ++#include <sys/types.h> + + #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID + +-- +2.14.1 + diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch new file mode 100644 index 000000000..467de3275 --- /dev/null +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch @@ -0,0 +1,27 @@ +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/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb new file mode 100644 index 000000000..bc157e267 --- /dev/null +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb @@ -0,0 +1,39 @@ +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 = "a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4" +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-Fix-build-with-musl-missing-header-include-for-dev_t.patch \ + " + +RECIPE_NO_UPDATE_REASON = "Waiting for resolution of https://github.com/kdave/btrfs-progs/issues/109" +inherit autotools-brokensep pkgconfig manpages + +CLEANBROKEN = "1" + +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" |
