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 713C115802E for ; Mon, 1 Jul 2024 17:57:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4BE4E2A5B; Mon, 1 Jul 2024 17:57:00 +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 9B4E0E2A5B for ; Mon, 1 Jul 2024 17:57:00 +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 E277C335CB4 for ; Mon, 1 Jul 2024 17:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56FF61D9C for ; Mon, 1 Jul 2024 17:56:58 +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: <1719856522.8d97ba8e872340f21b2739a25c6d397c396d57ae.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/linux-firmware-99999999.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 8d97ba8e872340f21b2739a25c6d397c396d57ae X-VCS-Branch: master Date: Mon, 1 Jul 2024 17:56:58 +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: 0cab3a52-e4b4-4add-b7f3-f6993a2f0107 X-Archives-Hash: 1eafff869cdc24e09d0aad8c6d0ce8d4 commit: 8d97ba8e872340f21b2739a25c6d397c396d57ae Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Jul 1 17:55:22 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Jul 1 17:55:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d97ba8e sys-kernel/linux-firmware: fix USE=initramfs in live, sync live Closes: https://bugs.gentoo.org/935288 Signed-off-by: Andrew Ammerlaan gentoo.org> .../linux-firmware/linux-firmware-99999999.ebuild | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index 144bba36cba3..17a10c80a0fc 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz" fi - KEYWORDS="~amd64" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Linux firmware files" @@ -66,6 +66,18 @@ IDEPEND=" QA_PREBUILT="*" +pkg_pretend() { + if use initramfs; then + if [[ -z ${ROOT} ]] && use dist-kernel; then + # Check, but don't die because we can fix the problem and then + # emerge --config ... to re-run installation. + nonfatal mount-boot_check_status + else + mount-boot_pkg_pretend + fi + fi +} + pkg_setup() { if use compress-xz || use compress-zstd ; then local CONFIG_CHECK @@ -83,18 +95,6 @@ pkg_setup() { linux-info_pkg_setup } -pkg_pretend() { - if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then - # Check, but don't die because we can fix the problem and then - # emerge --config ... to re-run installation. - nonfatal mount-boot_check_status - else - mount-boot_pkg_pretend - fi - fi -} - src_unpack() { if [[ ${PV} == 99999999* ]]; then git-r3_src_unpack @@ -120,7 +120,7 @@ src_prepare() { if use initramfs && ! use dist-kernel; then if [[ -d "${S}/amd-ucode" ]]; then - ."/${T}/make-amd-ucode-img" "${S}/amd-ucode" "${S}/amd-ucode.img" || die + "${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die else # If this will ever happen something has changed which # must be reviewed