From caf7310c93657af489096493f6cbad6439a7476c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Oct 2017 16:37:16 +0300 Subject: btrfs-tools: update to 4.13.2 Signed-off-by: Alexander Kanavin --- ...ith-musl-missing-header-include-for-dev_t.patch | 26 ++++++++++++++++ .../btrfs-tools/btrfs-tools_4.12.bb | 35 --------------------- .../btrfs-tools/btrfs-tools_4.13.2.bb | 36 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 35 deletions(-) create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch new file mode 100644 index 0000000000..790676b9cb --- /dev/null +++ b/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 +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 +--- + 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 + #include ++#include + + #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID + +-- +2.14.1 + diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb deleted file mode 100644 index c3cc89c2b0..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb +++ /dev/null @@ -1,35 +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 = "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" diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb new file mode 100644 index 0000000000..43924d874d --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb @@ -0,0 +1,36 @@ +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 = "37f1faef159ebcf91846e7126879b1a413cb29a5" +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 \ + " + +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