| 1 |
commit: 171c2f780c47ed4096572795f1d91fd7d8ab140f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 9 21:01:22 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 9 21:36:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171c2f78 |
| 7 |
|
| 8 |
kernel-install.eclass: Fix initrd location |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/705058 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/kernel-install.eclass | 6 ++++-- |
| 14 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass |
| 17 |
index f44fc3ebfa9..7e64f44c8c3 100644 |
| 18 |
--- a/eclass/kernel-install.eclass |
| 19 |
+++ b/eclass/kernel-install.eclass |
| 20 |
@@ -269,15 +269,17 @@ kernel-install_pkg_postinst() { |
| 21 |
if [[ -z ${ROOT} ]]; then |
| 22 |
mount-boot_pkg_preinst |
| 23 |
|
| 24 |
+ local image_path=$(kernel-install_get_image_path) |
| 25 |
if use initramfs; then |
| 26 |
# putting it alongside kernel image as 'initrd' makes |
| 27 |
# kernel-install happier |
| 28 |
kernel-install_build_initramfs \ |
| 29 |
- "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}" |
| 30 |
+ "${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \ |
| 31 |
+ "${PV}" |
| 32 |
fi |
| 33 |
|
| 34 |
kernel-install_install_kernel "${PV}" \ |
| 35 |
- "${EROOT}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \ |
| 36 |
+ "${EROOT}/usr/src/linux-${PV}/${image_path}" \ |
| 37 |
"${EROOT}/usr/src/linux-${PV}/System.map" |
| 38 |
fi |
Archives