From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 01/13] btrfs-tools: update to 4.19.1
Date: Tue, 18 Dec 2018 17:29:53 +0100 [thread overview]
Message-ID: <20181218163005.1330-1-alex.kanavin@gmail.com> (raw)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...el-lib-bitops-Fix-big-endian-compila.patch | 55 -------------------
...fs-tools_4.19.bb => btrfs-tools_4.19.1.bb} | 3 +-
2 files changed, 1 insertion(+), 57 deletions(-)
delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kernel-lib-bitops-Fix-big-endian-compila.patch
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.19.bb => btrfs-tools_4.19.1.bb} (92%)
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
similarity index 92%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.19.bb
rename to 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
--
2.17.1
next reply other threads:[~2018-12-18 16:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 16:29 Alexander Kanavin [this message]
2018-12-18 16:29 ` [PATCH 02/13] meson: update to 0.49.0 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 03/13] systemd: backport a patch to fix meson 0.49.0 issue Alexander Kanavin
2018-12-18 16:29 ` [PATCH 04/13] libdazzle: fix a build issue with meson 0.49.0 Alexander Kanavin
2019-01-03 8:46 ` Kang Kai
2019-01-03 11:13 ` Alexander Kanavin
2018-12-18 16:29 ` [PATCH 05/13] dnf: upgrade 4.0.9 -> 4.0.10 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 06/13] createrepo-c: update to 0.12.0 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 07/13] libdnf: upgrade 0.22.3 -> 0.24.1 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 08/13] lighttpd: upgrade 1.4.51 -> 1.4.52 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 09/13] boost: update to 1.69.0 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 10/13] gobject-introspection: upgrade 1.58.1 -> 1.58.2 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 11/13] libcomps: upgrade 0.1.8 -> 0.1.9 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 12/13] webkitgtk: upgrade 2.22.4 -> 2.22.5 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 13/13] librepo: upgrade 1.9.2 -> 1.9.3 Alexander Kanavin
2018-12-18 17:03 ` ✗ patchtest: failure for "btrfs-tools: update to 4.19.1..." and 12 more Patchwork
2018-12-18 17:46 ` Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181218163005.1330-1-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox