summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-11-15 20:31:26 +0100
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-11-18 10:19:16 +0100
commit0e1de47b7638be1dc913c291d7d147a839c7a21b (patch)
treea4d571f9432535aee4415a2d4cf70e95c4840d1b /eclass/dist-kernel-utils.eclass
parentkernel-install.eclass: also cleanup uki.efi in postrm (diff)
downloadgentoo-0e1de47b7638be1dc913c291d7d147a839c7a21b.tar.gz
gentoo-0e1de47b7638be1dc913c291d7d147a839c7a21b.tar.bz2
gentoo-0e1de47b7638be1dc913c291d7d147a839c7a21b.zip
dist-kernel-utils.eclass: set arch to kernel for installation
Some kernel-install plugins may require locating files in the installed kernel source tree, on e.g. amd64 they will fail to do so if we do not use tc-arch-kernel. sys-kernel/dkms' kernel-install plugin is an example of a plugin that requires this fix. Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'eclass/dist-kernel-utils.eclass')
-rw-r--r--eclass/dist-kernel-utils.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass
index d455c88ebee1..76a2f8d48cdf 100644
--- a/eclass/dist-kernel-utils.eclass
+++ b/eclass/dist-kernel-utils.eclass
@@ -33,6 +33,8 @@ case ${EAPI} in
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
+inherit toolchain-funcs
+
if [[ ${KERNEL_IUSE_SECUREBOOT} ]]; then
inherit secureboot
fi
@@ -135,7 +137,7 @@ dist-kernel_install_kernel() {
ebegin "Installing the kernel via installkernel"
# note: .config is taken relatively to System.map;
# initrd relatively to bzImage
- installkernel "${version}" "${image}" "${map}"
+ ARCH=$(tc-arch-kernel) installkernel "${version}" "${image}" "${map}"
eend ${?} || die -n "Installing the kernel failed"
}