| 1 |
commit: 7f907ce3d78a95139ebad835ae9a3d9ae123d9c6 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 6 01:20:03 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 6 15:41:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f907ce3 |
| 7 |
|
| 8 |
kernel-install.eclass: pkg_preinst: fix symlinks for merged-usr |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/843821 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/kernel-install.eclass | 6 ++++++ |
| 14 |
1 file changed, 6 insertions(+) |
| 15 |
|
| 16 |
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass |
| 17 |
index 08f631b5e865..8acf1ad1bc05 100644 |
| 18 |
--- a/eclass/kernel-install.eclass |
| 19 |
+++ b/eclass/kernel-install.eclass |
| 20 |
@@ -418,6 +418,12 @@ kernel-install_pkg_preinst() { |
| 21 |
eerror "Please verify that you are applying the correct patches." |
| 22 |
die "Kernel release mismatch (${release} instead of ${PV}*)" |
| 23 |
fi |
| 24 |
+ if [[ -L ${EROOT}/lib && ${EROOT}/lib -ef ${EROOT}/usr/lib ]]; then |
| 25 |
+ # Adjust symlinks for merged-usr. |
| 26 |
+ rm "${ED}/lib/modules/${ver}"/{build,source} || die |
| 27 |
+ dosym "../../../src/linux-${ver}" "/usr/lib/modules/${ver}/build" |
| 28 |
+ dosym "../../../src/linux-${ver}" "/usr/lib/modules/${ver}/source" |
| 29 |
+ fi |
| 30 |
} |
| 31 |
|
| 32 |
# @FUNCTION: kernel-install_install_all |
Archives