mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 15:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-tools: include linux/const.h to fix build with 5.12+ headers

Browse Source 
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>
This commit is contained in:
Bruce Ashfield
2021-06-18 15:43:45 -04:00
committed by Richard Purdie
parent 4a490a6b5e
commit 6636260620
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch Normal file
View File

@@ -0,0 +1,42 @@
From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 18 Jun 2021 11:10:36 -0400
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.
Upstream-status: OE Specific [mips64 + musl + libc-headers]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kerncompat.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/kerncompat.h b/kerncompat.h
index df167fe6..254235bd 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -30,6 +30,7 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <stdint.h>
+#include <linux/const.h>
#include <features.h>
--
2.25.1

1
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
View File

@@ -18,6 +18,7 @@ DEPENDS_append_class-target = " udev"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
"
SRCREV = "96d77fcefdd3b9fd297b5aabbce6dc43e2315ee2"
S = "${WORKDIR}/git"