overlay sys-kernel/coreos-sources: Revert patch which parallelizes btf generation

This patch causes btf mismatches between coreos-kernel and
coreos-modules, which prevents modules from being loaded.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2023-05-10 06:51:22 +00:00 committed by Krzesimir Nowak
parent 38118667f4
commit f4dc89a00a
3 changed files with 34 additions and 1 deletions

View File

@ -36,4 +36,5 @@ IUSE=""
# local patches overlap with the upstream patch. # local patches overlap with the upstream patch.
UNIPATCH_LIST=" UNIPATCH_LIST="
${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch \ ${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch \
${PATCH_DIR}/z0002-Revert-scripts-pahole-flags.sh-Parse-DWARF-and-gener.patch \
" "

View File

@ -1,7 +1,7 @@
From dcf70e8275cf5cc964a0657312af9210996ae2e7 Mon Sep 17 00:00:00 2001 From dcf70e8275cf5cc964a0657312af9210996ae2e7 Mon Sep 17 00:00:00 2001
From: Vito Caputo <vito.caputo@coreos.com> From: Vito Caputo <vito.caputo@coreos.com>
Date: Wed, 25 Nov 2015 02:59:45 -0800 Date: Wed, 25 Nov 2015 02:59:45 -0800
Subject: [PATCH] kbuild: derive relative path for srctree from CURDIR Subject: [PATCH 1/2] kbuild: derive relative path for srctree from CURDIR
This enables relocating source and build trees to different roots, This enables relocating source and build trees to different roots,
provided they stay reachable relative to one another. Useful for provided they stay reachable relative to one another. Useful for

View File

@ -0,0 +1,32 @@
From 7246ee058019099c59f9cce29b861df0613c0236 Mon Sep 17 00:00:00 2001
From: Jeremi Piotrowski <jpiotrowski@microsoft.com>
Date: Wed, 10 May 2023 08:48:09 +0200
Subject: [PATCH 2/2] Revert "scripts/pahole-flags.sh: Parse DWARF and generate
BTF with multithreading."
This breaks reproducibility of vmlinux btf output. The '--sort' arg does not
seem to work.
This reverts commit b4f72786429cc57383ff41e02407726313ca178d.
Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
---
scripts/pahole-flags.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 0d99ef17e4a5..c293941612e7 100755
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -16,8 +16,5 @@ fi
if [ "${pahole_ver}" -ge "121" ]; then
extra_paholeopt="${extra_paholeopt} --btf_gen_floats"
fi
-if [ "${pahole_ver}" -ge "122" ]; then
- extra_paholeopt="${extra_paholeopt} -j"
-fi
echo ${extra_paholeopt}
--
2.25.1