From bd651106fc87d2b22565d923217d315fcd537f0a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 25 Mar 2022 22:35:57 +0100 Subject: [PATCH] package/btrfs-progs: bump to version 5.16.2 Drop patches (already in version) https://github.com/kdave/btrfs-progs/blob/v5.16.2/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...nst-h-to-fix-build-with-5-12-headers.patch | 43 ---------------- ...-sys-sysinfo-h-conditionally-on-musl.patch | 49 ------------------- ...ocal-definition-for-alignment-macros.patch | 46 ----------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 5 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch delete mode 100644 package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch delete mode 100644 package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch deleted file mode 100644 index b6c1a42456..0000000000 --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 30 Dec 2021 15:23:59 +0200 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Signed-off-by: Bruce Ashfield -[remove invalid OE Upstream-status] -Signed-off-by: Stijn Tintel -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6c..2503d1afa 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch deleted file mode 100644 index 7473fe67cb..0000000000 --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 Jan 2022 22:44:44 +0100 -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl - -Make inclusion of sys/sysinfo.h conditional to avoid the following build -failure on musl: - -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from ./kerncompat.h:31, - from common/utils.c:42: -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - 7 | struct sysinfo { - | ^~~~~~~ -In file included from common/utils.c:27: -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - 10 | struct sysinfo { - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc - -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, -while both must not be included at the same time. Stop including -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and -causes the double definition for some reason. As we now include -linux/const.h directly, there's no other effective change. - -Pull-request: #433 -Signed-off-by: Fabrice Fontaine -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] ---- - kerncompat.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 2503d1afa..6ca1526e2 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch deleted file mode 100644 index 86c63edc30..0000000000 --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 6ca1526e2..f0a6e196e 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - { diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 339eab02aa..14eeb1ca07 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 54922df839..9bf50ccfda 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.15.1 +BTRFS_PROGS_VERSION = 5.16.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib