summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-06-18 15:43:45 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-21 11:09:56 +0100
commit663626062018c9ce42a3348fced2247cb0820627 (patch)
treec0b123a73807362d1a9fb0a559294c52b40e3f17 /meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
parent4a490a6b5e3edf3e9d41ff5c04dad30d7347f147 (diff)
downloadpoky-663626062018c9ce42a3348fced2247cb0820627.tar.gz
btrfs-tools: 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 kernels as well, since the header still exists, and is valid to include. (From OE-Core rev: 78eb20ed31e27865c990f96803215139bc99060f) (From OE-Core rev: e81b531939214a1a34f8841a5f0aaf16fbbe4d08) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
index 3fc959bf8e..d0c9cf2a99 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
@@ -18,6 +18,7 @@ DEPENDS_append_class-target = " udev"
18 18
19SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 19SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
20 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ 20 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
21 file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
21 " 22 "
22SRCREV = "96d77fcefdd3b9fd297b5aabbce6dc43e2315ee2" 23SRCREV = "96d77fcefdd3b9fd297b5aabbce6dc43e2315ee2"
23S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"