From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 9 Jan 2020 21:01:22 +0000 (+0100)
Subject: kernel-install.eclass: Fix initrd location
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=171c2f780c47ed4096572795f1d91fd7d8ab140f;p=gentoo.git

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 f44fc3ebfa9b..7e64f44c8c33 100644
--- 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