From caf7310c93657af489096493f6cbad6439a7476c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Oct 2017 16:37:16 +0300 Subject: [PATCH] btrfs-tools: update to 4.13.2 Signed-off-by: Alexander Kanavin --- ...usl-missing-header-include-for-dev_t.patch | 26 +++++++++++++++++++ ...fs-tools_4.12.bb => btrfs-tools_4.13.2.bb} | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.12.bb => btrfs-tools_4.13.2.bb} (90%) 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.13.2.bb similarity index 90% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb index c3cc89c2b0..43924d874d 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb @@ -14,9 +14,10 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl" DEPENDS_append_class-target = " udev" RDEPENDS_${PN} = "libgcc" -SRCREV = "0607132c3200bcead1426e6dc685432008de95de" +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 -- 2.40.1