Skip to content

Commit a2dc416

Browse files
committed
linux: pahole flags moved to scripts/Makefile.btf
pahole: added a revamped patch to remove the parallel implementation kernel: use pahole 1.27 feature of reproducible builds
1 parent e65dc8a commit a2dc416

File tree

3 files changed

+27
-54
lines changed

3 files changed

+27
-54
lines changed

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.12.20.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ IUSE=""
3636
# local patches overlap with the upstream patch.
3737
UNIPATCH_LIST="
3838
${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch \
39-
${PATCH_DIR}/z0002-revert-pahole-flags.patch \
39+
${PATCH_DIR}/z0002-pahole-support-reproducible-builds.patch \
4040
${PATCH_DIR}/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch \
4141
${PATCH_DIR}/z0004-efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch \
4242
${PATCH_DIR}/z0005-efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch \
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 9faff3734e6456e7927c0914829a4764ec9f1b44 Mon Sep 17 00:00:00 2001
2+
From: Adrian Vladu <avladu@cloudbasesolutions.com>
3+
Date: Tue, 17 Sep 2024 13:44:14 +0000
4+
Subject: [PATCH] pahole: support reproducible builds
5+
6+
---
7+
scripts/Makefile.btf | 3 +++
8+
1 file changed, 3 insertions(+)
9+
10+
diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
11+
index 2d6e5ed9081e..b2f88b0fcf37 100644
12+
--- a/scripts/Makefile.btf
13+
+++ b/scripts/Makefile.btf
14+
@@ -23,6 +23,9 @@ else
15+
# Switch to using --btf_features for v1.26 and later.
16+
pahole-flags-$(call test-ge, $(pahole-ver), 126) = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func
17+
18+
+# Support reproducible builds.
19+
+pahole-flags-$(call test-ge, $(pahole-ver), 127) = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,reproducible_build
20+
+
21+
endif
22+
23+
pahole-flags-$(CONFIG_PAHOLE_HAS_LANG_EXCLUDE) += --lang_exclude=rust
24+
--
25+
2.34.1
26+

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.12/z0002-revert-pahole-flags.patch

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)