| 1 |
Using virtual/linux-sources was a nice idea, but leads to multiple |
| 2 |
failures in practice. For example, we use 'portageq contents' later, and |
| 3 |
the virtual provides no files. We could handle the indirection with |
| 4 |
'portageq expand_virtual' in some cases but that requires the virtual to |
| 5 |
be installed on the system. |
| 6 |
|
| 7 |
Fixes: 388def77 ("kmerge.sh blows away the /usr/src/linux symlink ...") |
| 8 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 9 |
--- |
| 10 |
targets/support/kmerge.sh | 6 +----- |
| 11 |
1 file changed, 1 insertion(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 14 |
index 40e208e4..c4136dec 100755 |
| 15 |
--- a/targets/support/kmerge.sh |
| 16 |
+++ b/targets/support/kmerge.sh |
| 17 |
@@ -118,11 +118,7 @@ eval "kernel_merge=\$clst_boot_kernel_${kname}_packages" |
| 18 |
eval "kernel_use=\$clst_boot_kernel_${kname}_use" |
| 19 |
eval eval kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs ) |
| 20 |
eval "ksource=\$clst_boot_kernel_${kname}_sources" |
| 21 |
- |
| 22 |
-if [ -z "${ksource}" ] |
| 23 |
-then |
| 24 |
- ksource="virtual/linux-sources" |
| 25 |
-fi |
| 26 |
+[[ -z ${ksource} ]] && ksource="sys-kernel/gentoo-sources" |
| 27 |
|
| 28 |
# Check if we have a match in kerncach |
| 29 |
|
| 30 |
-- |
| 31 |
2.26.2 |
Archives