summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-03-04 13:18:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-04 17:14:15 +0000
commit73f25a3ede62254a0c18f4779f3c984feedbd3b0 (patch)
tree53e30f2803329d92f489b70532521ed414048088 /meta
parentbf6ce6ecc855bf9d7f7d9d301e38591d2ab87db2 (diff)
downloadpoky-73f25a3ede62254a0c18f4779f3c984feedbd3b0.tar.gz
btrfs-tools: upgrade 5.16 -> 5.16.2
0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch removed since it's included in 5.16.2 Changelog: ========= mkfs: fix detection of profile type for zoned mode when creating DUP build: - add missing stub for zoned mode helper when zoned mode not enabled - fix 64bit types on MIPS and PowerPC - improved zoned mode support autodetection, for systems with existing blkzone.h header but missing support for zone capacity other: doc updates, test updates (From OE-Core rev: ec04580374ed6cc26471a338f84794f41931eca1) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch46
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb)3
2 files changed, 1 insertions, 48 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch
deleted file mode 100644
index b0fe67922d..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001
2From: David Sterba <dsterba@suse.com>
3Date: Thu, 13 Jan 2022 14:47:08 +0100
4Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment
5 macros
6
7There's still problem left with compilation on musl and kernel < 5.11,
8because __ALIGN_KERNEL is not defined anymore:
9
10../bin/ld: kernel-shared/volumes.o: in function `create_chunk':
11volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL'
12
13Due to the entangled includes and unconditional definition of
14__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it
15eventually (as kerncompat.h is the first include). Instead add local
16definitions of the macros and rename them to avoid name clashes.
17
18Pull-request: #433
19
20Upstream-Status: Backport [https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58]
21
22Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
23---
24 kerncompat.h | 9 ++++++++-
25 1 file changed, 8 insertions(+), 1 deletion(-)
26
27diff --git a/kerncompat.h b/kerncompat.h
28index 6ca1526e2..f0a6e196e 100644
29--- a/kerncompat.h
30+++ b/kerncompat.h
31@@ -359,7 +359,14 @@ do { \
32
33 /* Alignment check */
34 #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0)
35-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a))
36+
37+/*
38+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around
39+ * issues caused by moving the definition in 5.12
40+ */
41+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1)
42+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask))
43+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a))
44
45 static inline int is_power_of_2(unsigned long n)
46 {
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb
index e5b2057f26..4ab486c465 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb
@@ -17,9 +17,8 @@ DEPENDS = "lzo util-linux zlib"
17 17
18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \ 18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \
19 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ 19 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
20 file://0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch \
21 " 20 "
22SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8" 21SRCREV = "31458c9c81935abbed010221261897273a98d2c1"
23S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
24 23
25PACKAGECONFIG ??= " \ 24PACKAGECONFIG ??= " \