| 1 |
commit: 388def77c5bc066c4230c443b84e2477da1ebff2 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 20 19:44:54 2015 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 20 19:44:54 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=388def77 |
| 7 |
|
| 8 |
kmerge.sh blows away the /usr/src/linux symlink but nothing puts it back in place (nessesarily) |
| 9 |
add code to properly setup the symlink to the location the freshly installed kernel sources |
| 10 |
|
| 11 |
targets/support/kmerge.sh | 6 +++++- |
| 12 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 15 |
index b72eeb6..3d4afea 100755 |
| 16 |
--- a/targets/support/kmerge.sh |
| 17 |
+++ b/targets/support/kmerge.sh |
| 18 |
@@ -253,8 +253,12 @@ then |
| 19 |
fi |
| 20 |
|
| 21 |
else |
| 22 |
- [ -L /usr/src/linux ] && rm -f /usr/src/linux |
| 23 |
run_merge "${clst_ksource}" || exit 1 |
| 24 |
+ #ensure that there is a /usr/src/linux symlink and it points to the sources we just installed |
| 25 |
+ echo "Adjusting /usr/src/linux to point to \ |
| 26 |
+$(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)" |
| 27 |
+ ln -snf $(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \ |
| 28 |
+ /usr/src/linux |
| 29 |
if [ ! "${clst_kextraversion}" = "" ] |
| 30 |
then |
| 31 |
echo "Setting extraversion to ${clst_kextraversion}" |
Archives