From b8500a65023dd4e278af2400ebb94e4768473130 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Mon, 8 Jan 2024 09:32:28 -0600 Subject: 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 --- 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 -- cgit v1.2.3-65-gdbad