commit: b8500a65023dd4e278af2400ebb94e4768473130
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 15:32:28 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 15:36:07 2024 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b8500a65
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 <AT> gentoo.org>
targets/support/kmerge.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
