summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch55
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb)3
2 files changed, 57 insertions, 1 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch
new file mode 100644
index 0000000000..ad430858c9
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch
@@ -0,0 +1,55 @@
1From 920c515478b441eaca31e33a18b95ceaa49ace19 Mon Sep 17 00:00:00 2001
2From: Rosen Penev <rosenp@gmail.com>
3Date: Mon, 5 Nov 2018 11:06:41 -0800
4Subject: [PATCH] btrfs-progs: kernel-lib: bitops: Fix big endian compilation
5
6Replaced bswap with _ variants bswap_32 etc. While it's a glibc
7extension, all of the popular libc implementations (glibc, uClibc, musl,
8BIONIC) seem to support it.
9
10Added static inline to two functions to match little endian variants. This
11fixes a linking error experienced when compiling on gcc 7.3.0 with LTO,
12possibly a bug that was fixed later.
13
14Upstream-Status: Backport [https://gitlab.com/kdave/btrfs-progs/commit/ed570e2df335063280c9d3affd8bb89919a1ac0d.patch]
15Reviewed-by: Nikolay Borisov <nborisov@suse.com>
16Signed-off-by: Rosen Penev <rosenp@gmail.com>
17Signed-off-by: David Sterba <dsterba@suse.com>
18Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
19---
20 kernel-lib/bitops.h | 8 ++++----
21 1 file changed, 4 insertions(+), 4 deletions(-)
22
23diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h
24index b1fd6f53..2c51a265 100644
25--- a/kernel-lib/bitops.h
26+++ b/kernel-lib/bitops.h
27@@ -178,9 +178,9 @@ static inline unsigned long find_next_zero_bit(const unsigned long *addr,
28 static inline unsigned long ext2_swab(const unsigned long y)
29 {
30 #if BITS_PER_LONG == 64
31- return (unsigned long) bswap64((u64) y);
32+ return (unsigned long) bswap_64((u64) y);
33 #elif BITS_PER_LONG == 32
34- return (unsigned long) bswap32((u32) y);
35+ return (unsigned long) bswap_32((u32) y);
36 #else
37 #error BITS_PER_LONG not defined
38 #endif
39@@ -218,14 +218,14 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1,
40 return min(start + __ffs(ext2_swab(tmp)), nbits);
41 }
42
43-unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
44+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
45 unsigned long offset)
46 {
47 return _find_next_bit_le(addr, NULL, size, offset, ~0UL);
48 }
49
50
51-unsigned long find_next_bit_le(const void *addr, unsigned long size,
52+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size,
53 unsigned long offset)
54 {
55 return _find_next_bit_le(addr, NULL, size, offset, 0UL);
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
index 6b53fbcd7f..f5e0f77c8a 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.17.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
@@ -14,11 +14,12 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native"
14DEPENDS_append_class-target = " udev" 14DEPENDS_append_class-target = " udev"
15RDEPENDS_${PN} = "libgcc" 15RDEPENDS_${PN} = "libgcc"
16 16
17SRCREV = "7faaca0d9f78f7162ae603231f693dd8e1af2a41" 17SRCREV = "d72d913291683188ddf5d758db02f1bc3b05d2f7"
18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 18SRC_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-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \ 20 file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
21 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ 21 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
22 file://0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch \
22 " 23 "
23 24
24inherit autotools-brokensep pkgconfig manpages distutils3-base 25inherit autotools-brokensep pkgconfig manpages distutils3-base