kernel-install.eclass: Fix initrd location

Closes: https://bugs.gentoo.org/705058
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index f44fc3ebfa9b91c2323a4208abe0f8ece7a69f65..7e64f44c8c33c07943df5d8202032a11be0943c6 100644 (file)
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -269,15 +269,17 @@ kernel-install_pkg_postinst() {
        if [[ -z ${ROOT} ]]; then
                mount-boot_pkg_preinst
 
+               local image_path=$(kernel-install_get_image_path)
                if use initramfs; then
                        # putting it alongside kernel image as 'initrd' makes
                        # kernel-install happier
                        kernel-install_build_initramfs \
-                               "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}"
+                               "${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \
+                               "${PV}"
                fi
 
                kernel-install_install_kernel "${PV}" \
-                       "${EROOT}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+                       "${EROOT}/usr/src/linux-${PV}/${image_path}" \
                        "${EROOT}/usr/src/linux-${PV}/System.map"
        fi