summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch
deleted file mode 100644
index be942388a5..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Fri, 18 Jun 2021 11:10:36 -0400
4Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+
5 headers
6
7btrfs-tools compile fails with mips, musl and 5.12+ headers.
8
9The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we
10add an explicit include of const.h to pickup the macro:
11
12 | make: *** [Makefile:595: mkfs.btrfs] Error 1
13 | make: *** Waiting for unfinished jobs....
14 | libbtrfs.a(volumes.o): in function `dev_extent_search_start':
15 | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL'
16 | collect2: error: ld returned 1 exit status
17
18This is safe for older kernel's as well, since the header still
19exists, and is valid to include.
20
21Upstream-Status: Inappropriate [mips64 + musl + libc-headers]
22
23Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
24---
25 kerncompat.h | 1 +
26 1 file changed, 1 insertion(+)
27
28diff --git a/kerncompat.h b/kerncompat.h
29index df167fe6..254235bd 100644
30--- a/kerncompat.h
31+++ b/kerncompat.h
32@@ -30,6 +30,7 @@
33 #include <linux/types.h>
34 #include <linux/kernel.h>
35 #include <stdint.h>
36+#include <linux/const.h>
37
38 #include <features.h>
39
40--
412.25.1
42