From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76E1C15823F for ; Sat, 18 Nov 2023 09:19:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B93D92BC015; Sat, 18 Nov 2023 09:19:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A39542BC015 for ; Sat, 18 Nov 2023 09:19:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBE96335D02 for ; Sat, 18 Nov 2023 09:19:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E6DB13A0 for ; Sat, 18 Nov 2023 09:19:21 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1700299156.0e1de47b7638be1dc913c291d7d147a839c7a21b.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/dist-kernel-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0e1de47b7638be1dc913c291d7d147a839c7a21b X-VCS-Branch: master Date: Sat, 18 Nov 2023 09:19:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8616562c-ed33-4297-9e11-eef4c79b5750 X-Archives-Hash: af184daf63351ea81b28c2604c97481b commit: 0e1de47b7638be1dc913c291d7d147a839c7a21b Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Nov 15 19:31:26 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Nov 18 09:19:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1de47b 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 gentoo.org> eclass/dist-kernel-utils.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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" }