commit: a6da8b1dcb1503e898b2d0d3f792dc8be9999313
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:17:56 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 02:50:08 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a6da8b1d
targets: Default to sys-kernel/gentoo-sources directly
Using virtual/linux-sources was a nice idea, but leads to multiple
failures in practice. For example, we use 'portageq contents' later, and
the virtual provides no files. We could handle the indirection with
'portageq expand_virtual' in some cases but that requires the virtual to
be installed on the system.
Fixes: 388def77 ("kmerge.sh blows away the /usr/src/linux symlink ...")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/support/kmerge.sh | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 911d7cb3..b2c4a31a 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -118,11 +118,7 @@ eval "kernel_merge=\$clst_boot_kernel_${kname}_packages"
eval "kernel_use=\$clst_boot_kernel_${kname}_use"
eval eval kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs )
eval "ksource=\$clst_boot_kernel_${kname}_sources"
-
-if [ -z "${ksource}" ]
-then
- ksource="virtual/linux-sources"
-fi
+[[ -z ${ksource} ]] && ksource="sys-kernel/gentoo-sources"
# Check if we have a match in kerncach
