diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-04 16:37:16 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-09 12:33:16 +0000 |
commit | 4c63d6935a4a4d19f09051a97b9d0e38c86359e8 (patch) | |
tree | 6ac1ff1138afc802887e37f5bd0d8c920f20014f | |
parent | fa1a12a33ae5c73b83fc265012e8959e77f9df33 (diff) | |
download | poky-4c63d6935a4a4d19f09051a97b9d0e38c86359e8.tar.gz |
btrfs-tools: update to 4.13.2
(From OE-Core rev: caf7310c93657af489096493f6cbad6439a7476c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.2.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.12.bb) | 3 |
2 files changed, 28 insertions, 1 deletions
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 @@ | |||
1 | From bc35c4caebb57cc8b96c30c25432b12ca8dc18d5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 6 Oct 2017 15:03:49 +0300 | ||
4 | Subject: [PATCH] Fix build with musl (missing header include for dev_t). | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | convert/source-fs.h | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/convert/source-fs.h b/convert/source-fs.h | ||
13 | index 23f3356..6fd770f 100644 | ||
14 | --- a/convert/source-fs.h | ||
15 | +++ b/convert/source-fs.h | ||
16 | @@ -20,6 +20,7 @@ | ||
17 | #include "kerncompat.h" | ||
18 | #include <linux/kdev_t.h> | ||
19 | #include <pthread.h> | ||
20 | +#include <sys/types.h> | ||
21 | |||
22 | #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID | ||
23 | |||
24 | -- | ||
25 | 2.14.1 | ||
26 | |||
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 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" | |||
14 | DEPENDS_append_class-target = " udev" | 14 | DEPENDS_append_class-target = " udev" |
15 | RDEPENDS_${PN} = "libgcc" | 15 | RDEPENDS_${PN} = "libgcc" |
16 | 16 | ||
17 | SRCREV = "0607132c3200bcead1426e6dc685432008de95de" | 17 | SRCREV = "37f1faef159ebcf91846e7126879b1a413cb29a5" |
18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ | 18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ |
19 | file://0001-Makefile-build-mktables-using-native-gcc.patch \ | 19 | file://0001-Makefile-build-mktables-using-native-gcc.patch \ |
20 | file://0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | inherit autotools-brokensep pkgconfig manpages | 23 | inherit autotools-brokensep pkgconfig manpages |