aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-12-18 17:29:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-02 13:54:10 +0000
commit32f52b029c2e578227b94c75fabe6c871d7d7546 (patch)
tree2b1c6f51467f9facd838483b93e39d4ded6b898b
parent36c526fb9a3a31ae9499a81c84d5086fff65fb7a (diff)
downloadopenembedded-core-contrib-32f52b029c2e578227b94c75fabe6c871d7d7546.tar.gz
openembedded-core-contrib-32f52b029c2e578227b94c75fabe6c871d7d7546.tar.bz2
openembedded-core-contrib-32f52b029c2e578227b94c75fabe6c871d7d7546.zip
btrfs-tools: update to 4.19.1
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.1.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb)3
2 files changed, 1 insertions, 57 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
deleted file mode 100644
index ad430858c9c..00000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 920c515478b441eaca31e33a18b95ceaa49ace19 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Mon, 5 Nov 2018 11:06:41 -0800
-Subject: [PATCH] btrfs-progs: kernel-lib: bitops: Fix big endian compilation
-
-Replaced bswap with _ variants bswap_32 etc. While it's a glibc
-extension, all of the popular libc implementations (glibc, uClibc, musl,
-BIONIC) seem to support it.
-
-Added static inline to two functions to match little endian variants. This
-fixes a linking error experienced when compiling on gcc 7.3.0 with LTO,
-possibly a bug that was fixed later.
-
-Upstream-Status: Backport [https://gitlab.com/kdave/btrfs-progs/commit/ed570e2df335063280c9d3affd8bb89919a1ac0d.patch]
-Reviewed-by: Nikolay Borisov <nborisov@suse.com>
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- kernel-lib/bitops.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h
-index b1fd6f53..2c51a265 100644
---- a/kernel-lib/bitops.h
-+++ b/kernel-lib/bitops.h
-@@ -178,9 +178,9 @@ static inline unsigned long find_next_zero_bit(const unsigned long *addr,
- static inline unsigned long ext2_swab(const unsigned long y)
- {
- #if BITS_PER_LONG == 64
-- return (unsigned long) bswap64((u64) y);
-+ return (unsigned long) bswap_64((u64) y);
- #elif BITS_PER_LONG == 32
-- return (unsigned long) bswap32((u32) y);
-+ return (unsigned long) bswap_32((u32) y);
- #else
- #error BITS_PER_LONG not defined
- #endif
-@@ -218,14 +218,14 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1,
- return min(start + __ffs(ext2_swab(tmp)), nbits);
- }
-
--unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
-+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
- unsigned long offset)
- {
- return _find_next_bit_le(addr, NULL, size, offset, ~0UL);
- }
-
-
--unsigned long find_next_bit_le(const void *addr, unsigned long size,
-+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size,
- unsigned long offset)
- {
- return _find_next_bit_le(addr, NULL, size, offset, 0UL);
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
index f5e0f77c8a2..2f59a0c13ea 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.1.bb
@@ -14,12 +14,11 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native"
DEPENDS_append_class-target = " udev"
RDEPENDS_${PN} = "libgcc"
-SRCREV = "d72d913291683188ddf5d758db02f1bc3b05d2f7"
+SRCREV = "167651ca29ec522cff0d81b52dc0cc4ae4e3f535"
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-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
- file://0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch \
"
inherit autotools-brokensep pkgconfig manpages distutils3-base