diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-10-19 11:17:56 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-10-20 00:10:03 -0700 |
| commit | ffe1b6669ba37b166ba968c0cc99267f1b1f0aab (patch) | |
| tree | 1feb1ab293458afe5c848bf174f61ffed51362d1 | |
| parent | targets: Emerge kernel sources with --update (diff) | |
| download | catalyst-ffe1b6669ba37b166ba968c0cc99267f1b1f0aab.tar.gz catalyst-ffe1b6669ba37b166ba968c0cc99267f1b1f0aab.tar.bz2 catalyst-ffe1b6669ba37b166ba968c0cc99267f1b1f0aab.zip | |
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@gentoo.org>
| -rwxr-xr-x | targets/support/kmerge.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 40e208e4..c4136dec 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 |