1 |
Just use the thing that exists instead of rolling our own... |
2 |
|
3 |
Signed-off-by: Matt Turner <mattst88@g.o> |
4 |
--- |
5 |
targets/support/kmerge.sh | 12 +++--------- |
6 |
1 file changed, 3 insertions(+), 9 deletions(-) |
7 |
|
8 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
9 |
index 1209e330..7eb18313 100755 |
10 |
--- a/targets/support/kmerge.sh |
11 |
+++ b/targets/support/kmerge.sh |
12 |
@@ -193,9 +193,7 @@ then |
13 |
rm -f ${clst_port_conf}/profile/package.provided |
14 |
fi |
15 |
|
16 |
- [ -L /usr/src/linux ] && rm -f /usr/src/linux |
17 |
- |
18 |
- run_merge "${ksource}" |
19 |
+ USE=symlink run_merge "${ksource}" |
20 |
|
21 |
SOURCESDIR="/tmp/kerncache/${kname}/sources" |
22 |
if [ -L /usr/src/linux ] |
23 |
@@ -225,12 +223,8 @@ then |
24 |
fi |
25 |
fi |
26 |
else |
27 |
- run_merge "${ksource}" |
28 |
- #ensure that there is a /usr/src/linux symlink and it points to the sources we just installed |
29 |
- echo "Adjusting /usr/src/linux to point to \ |
30 |
-$(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)" |
31 |
- ln -snf $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \ |
32 |
- /usr/src/linux |
33 |
+ USE=symlink run_merge "${ksource}" |
34 |
+ |
35 |
if [ ! "${clst_kextraversion}" = "" ] |
36 |
then |
37 |
echo "Setting extraversion to ${clst_kextraversion}" |
38 |
-- |
39 |
2.26.2 |