[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/

[Matt Turner]

commit:     0fe50361b38be1f7ad67d4172962c4d2f4adb453
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:08:28 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0fe50361

targets: Use USE=symlink when emerging kernel sources

Just use the thing that exists instead of rolling our own...

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 1209e330..7eb18313 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -193,9 +193,7 @@ then
                rm -f ${clst_port_conf}/profile/package.provided
        fi
 
-       [ -L /usr/src/linux ] && rm -f /usr/src/linux
-
-       run_merge "${ksource}"
+       USE=symlink run_merge "${ksource}"
 
        SOURCESDIR="/tmp/kerncache/${kname}/sources"
        if [ -L /usr/src/linux ]
@@ -225,12 +223,8 @@ then
                fi
        fi
 else
-       run_merge "${ksource}"
-       #ensure that there is a /usr/src/linux symlink and it points to the 
sources we just installed
-       echo "Adjusting /usr/src/linux to point to \
-$(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 
2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)"
-       ln -snf $(portageq contents / $(portageq best_visible / "${ksource}" 
2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 
2>/dev/null) \
-               /usr/src/linux
+       USE=symlink run_merge "${ksource}"
+
        if [ ! "${clst_kextraversion}" = "" ]
        then
                echo "Setting extraversion to ${clst_kextraversion}"