From b0d17fa3abf692179d5f3972a75eccbc2e0a8f7d Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 22 Apr 2020 22:01:59 +0100
Subject: eclass/linux-build: do not rely on debianutils to install kernel

---
 eclass/linux-build.eclass | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'eclass')

diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass
index 9255d3ea..7d10f0af 100644
--- a/eclass/linux-build.eclass
+++ b/eclass/linux-build.eclass
@@ -413,6 +413,7 @@ _linux-build_src_install_sources() {
 _linux-build_src_install_build() {
 	einfo "Installing kernel"
 	emake install "${myopt[@]}" \
+		INSTALLKERNEL=../bin/true \
 		INSTALL_PATH="${WORKDIR}/boot"
 
 	if _linux-build_configval ARM ||
@@ -424,9 +425,13 @@ _linux-build_src_install_build() {
 	fi
 
 	insinto "/boot/${KV_FULL}"
-	newins "${WORKDIR}/boot/config-${KV_FULL}"     kernel.cfg
-	newins "${WORKDIR}/boot/vmlinuz-${KV_FULL}"    kernel.img
-	newins "${WORKDIR}/boot/System.map-${KV_FULL}" System.map
+	newins "${BUILDDIR}/.config"          kernel.cfg
+	newins "${BUILDDIR}/System.map"       System.map
+
+	case "$(tc-arch-kernel)" in
+		x86) newins "${BUILDDIR}/arch/$(tc-arch-kernel)/boot/bzImage" kernel.img ;;
+		arm|arm64) newins "${BUILDDIR}/arch/$(tc-arch-kernel)/boot/Image" kernel.img ;;
+	esac
 
 	if _linux-build_configval CMDLINE_BOOL && _linux-build_configval CMDLINE ; then
 		insinto "/boot/${KV_FULL}"
-- 
cgit v1.2.3