bpftool-native: Upgrade 6.16 -> 7.3.4

Drop patches which are included in this release: 0001-libbpf-Fix-Wdiscarded-qualifiers-under-C23.patch 0002-tools-linux-types.h-Add-128-bit-integer-types-for-ar.patch Derive the kernel.org v<major>.x directory from PV. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
2026-11-13 03:37:15 +00:00 · 2026-11-11 18:21:48 -08:00
1 parent 6482e70bad
commit 2ee33fba32
@@ -9,12 +9,8 @@ DEPENDS = "binutils-native elfutils-native"

 inherit native bash-completion

-SRC_URI = "\
-    ${KERNELORG_MIRROR}/linux/kernel/v6.x/linux-${PV}.tar.xz \
-    file://0001-libbpf-Fix-Wdiscarded-qualifiers-under-C23.patch \
-    file://0002-tools-linux-types.h-Add-128-bit-integer-types-for-ar.patch \
-"
-SRC_URI[sha256sum] = "1a4be2fe6b5246aa4ac8987a8a4af34c42a8dd7d08b46ab48516bcc1befbcd83"
+SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${@d.getVar('PV').split('.')[0]}.x/linux-${PV}.tar.xz"
+SRC_URI[sha256sum] = "b11b6df8295e8e991ff040b71aaa4994a8b55caa23b6b092907f195b5840fd1f"

 S = "${UNPACKDIR}/linux-${PV}"

@@ -1,69 +0,0 @@
-From ab21cf885fb2af179c44d8beeabd716133b9385d Mon Sep 17 00:00:00 2001
-From: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
-Date: Sat, 6 Dec 2025 14:28:25 +0500
-Subject: [PATCH] libbpf: Fix -Wdiscarded-qualifiers under C23
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit d70f79fef65810faf64dbae1f3a1b5623cdb2345 upstream.
-
-glibc ≥ 2.42 (GCC 15) defaults to -std=gnu23, which promotes
-Wdiscarded-qualifiers to an error.
-
-In C23, strstr() and strchr() return "const char *".
-
-Change variable types to const char * where the pointers are never
-modified (res, sym_sfx, next_path).
-
-Suggested-by: Florian Weimer <fweimer@redhat.com>
-Suggested-by: Andrii Nakryiko <andrii@kernel.org>
-Signed-off-by: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
-Link: https://lore.kernel.org/r/20251206092825.1471385-1-mikhail.v.gavrilov@gmail.com
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-[ shung-hsi.yu: needed to fix kernel build failure due to libbpf since glibc
-  2.43+ (which adds 'const' qualifier to strstr) ]
-Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.18.y&id=ab21cf885fb2af179c44d8beeabd716133b9385d]
-Signed-off-by: He Zhe <zhe.he@windriver.com>
---
- tools/lib/bpf/libbpf.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
-index dd3b2f57082d..9c98c6adb6d0 100644
--- a/tools/lib/bpf/libbpf.c
-+++ b/tools/lib/bpf/libbpf.c
-@@ -8245,7 +8245,7 @@ static int kallsyms_cb(unsigned long long sym_addr, char sym_type,
- 	struct bpf_object *obj = ctx;
- 	const struct btf_type *t;
- 	struct extern_desc *ext;
-	char *res;
-+	const char *res;
- 
- 	res = strstr(sym_name, ".llvm.");
- 	if (sym_type == 'd' && res)
-@@ -11574,7 +11574,8 @@ static int avail_kallsyms_cb(unsigned long long sym_addr, char sym_type,
- 		 *
- 		 *   [0] fb6a421fb615 ("kallsyms: Match symbols exactly with CONFIG_LTO_CLANG")
- 		 */
-		char sym_trim[256], *psym_trim = sym_trim, *sym_sfx;
-+		char sym_trim[256], *psym_trim = sym_trim;
-+		const char *sym_sfx;
- 
- 		if (!(sym_sfx = strstr(sym_name, ".llvm.")))
- 			return 0;
-@@ -12159,7 +12160,7 @@ static int resolve_full_path(const char *file, char *result, size_t result_sz)
- 		if (!search_paths[i])
- 			continue;
- 		for (s = search_paths[i]; s != NULL; s = strchr(s, ':')) {
-			char *next_path;
-+			const char *next_path;
- 			int seg_len;
- 
- 			if (s[0] == ':')
-- 
-2.34.1
-
@@ -1,47 +0,0 @@
-From 10a47fb67340bca274276faf855d7d460afd9a7a Mon Sep 17 00:00:00 2001
-From: Will Deacon <will@kernel.org>
-Date: Fri, 26 Jun 2026 15:17:28 +0100
-Subject: [PATCH] tools: linux/types.h: Add 128-bit integer types for arm64 UAPI
- structures
-
-The arm64 UAPI exposes some 128-bit integer types to represent things
-such as fpsimd registers in the sigcontext. In preparation for defining
-these using the '__u128' typedef implemented by uapi/linux/types.h, copy
-that typedef over to the private linux/types.h header used by the tools
-directory.
-
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: David Matlack <dmatlack@google.com>
-Signed-off-by: Will Deacon <will@kernel.org>
-
-Debian 13 now ships linux-libc-dev 7.3, whose arm64 asm/ptrace.h and
-asm/sigcontext.h use __u128. bpftool-native picks up
-tools/include/linux/types.h ahead of the host linux/types.h, so the
-build fails on arm64 hosts with "unknown type name '__u128'".
-
-Upstream-Status: Backport [https://git.kernel.org/torvalds/c/10a47fb67340bca274276faf855d7d460afd9a7a]
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
- tools/include/linux/types.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h
-index d41f8a261bce8..b6c473b7920db 100644
--- a/tools/include/linux/types.h
-+++ b/tools/include/linux/types.h
-@@ -23,6 +23,11 @@ typedef enum {
- 	__GFP_HIGH
- } gfp_t;
- 
-+#ifdef __SIZEOF_INT128__
-+typedef __signed__ __int128 __s128 __attribute__((aligned(16)));
-+typedef unsigned __int128 __u128 __attribute__((aligned(16)));
-+#endif
-+
- /*
-  * We define u64 as uint64_t for every architecture
-  * so that we can print it with "%"PRIx64 without getting warnings.
-- 
-2.53.0
-