aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2024-01-08 09:32:28 -0600
committerBen Kohler <bkohler@gentoo.org>2024-01-08 09:36:07 -0600
commitb8500a65023dd4e278af2400ebb94e4768473130 (patch)
treefe29bf427a7290be16dd4540c1138501f09e602b
parentbase/stagebase.py: Do not touch subarch if chost is set (diff)
downloadcatalyst-b8500a65023dd4e278af2400ebb94e4768473130.tar.gz
catalyst-b8500a65023dd4e278af2400ebb94e4768473130.tar.bz2
catalyst-b8500a65023dd4e278af2400ebb94e4768473130.zip
kmerge.sh: don't remove the /usr/src/linux symlink
Removing this symlink causes failures for any specs building more than one kernel, since we no longer do a full unmerge/remerge of kernel sources between kernel builds. We probably need to set USE=symlink for the kernel sources so that specs building 2 kernels from different sets of sources do not fail. Signed-off-by: Ben Kohler <bkohler@gentoo.org>
-rwxr-xr-xtargets/support/kmerge.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 7114ff91..41fac810 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -207,5 +207,6 @@ fi
if [[ ! ${cached_kernel_found} ]]; then
run_merge --deselect "${ksource}"
- rm /usr/src/linux
+ # This was breaking multi-kernel iso builds, probably not needed
+ # rm /usr/src/linux
fi