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 44B96158451 for ; Fri, 12 Jan 2024 11:45:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C3B5E2ABE; Fri, 12 Jan 2024 11:45:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C53DE2ABE for ; Fri, 12 Jan 2024 11:45:39 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B04A34312E for ; Fri, 12 Jan 2024 11:45:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEAE411F4 for ; Fri, 12 Jan 2024 11:45:36 +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: <1705059929.ec00b7c50c51d05c2b576d3670e91ffc1e2dd4f8.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/installkernel/installkernel-12.ebuild sys-kernel/installkernel/installkernel-14-r1.ebuild sys-kernel/installkernel/installkernel-14.ebuild X-VCS-Directories: sys-kernel/installkernel/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: ec00b7c50c51d05c2b576d3670e91ffc1e2dd4f8 X-VCS-Branch: master Date: Fri, 12 Jan 2024 11:45:36 +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: ddf56b32-ba06-44e1-a946-3a604989263a X-Archives-Hash: 31cc4200fb512c7a2c14c8eeb2c9b0b8 commit: ec00b7c50c51d05c2b576d3670e91ffc1e2dd4f8 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Jan 12 11:44:08 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Jan 12 11:45:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec00b7c5 sys-kernel/installkernel: fix S after rename and set initrd/uki generators to none by default if unset, this change makes USE=generic-uki work automatically. While of course still retaining the possibility of manually overriding the config file Signed-off-by: Andrew Ammerlaan gentoo.org> sys-kernel/installkernel/installkernel-12.ebuild | 1 + .../{installkernel-14.ebuild => installkernel-14-r1.ebuild} | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/sys-kernel/installkernel/installkernel-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild index b3fc7f5fa826..042e7cbdf2d6 100644 --- a/sys-kernel/installkernel/installkernel-12.ebuild +++ b/sys-kernel/installkernel/installkernel-12.ebuild @@ -7,6 +7,7 @@ DESCRIPTION="Gentoo fork of installkernel script from debianutils" HOMEPAGE="https://github.com/projg2/installkernel-gentoo" SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-gentoo-${PV}" LICENSE="GPL-2+" SLOT="0" diff --git a/sys-kernel/installkernel/installkernel-14.ebuild b/sys-kernel/installkernel/installkernel-14-r1.ebuild similarity index 91% rename from sys-kernel/installkernel/installkernel-14.ebuild rename to sys-kernel/installkernel/installkernel-14-r1.ebuild index 4be27a583bfa..cb9f31daa48c 100644 --- a/sys-kernel/installkernel/installkernel-14.ebuild +++ b/sys-kernel/installkernel/installkernel-14-r1.ebuild @@ -7,6 +7,7 @@ DESCRIPTION="Gentoo fork of installkernel script from debianutils" HOMEPAGE="https://github.com/projg2/installkernel-gentoo" SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-gentoo-${PV}" LICENSE="GPL-2+" SLOT="0" @@ -61,14 +62,22 @@ src_install() { else echo "layout=bls" >> "${T}/install.conf" || die fi + if use dracut; then echo "initrd_generator=dracut" >> "${T}/install.conf" || die if ! use ukify; then echo "uki_generator=dracut" >> "${T}/install.conf" || die fi + else + echo "initrd_generator=none" >> "${T}/install.conf" || die fi + if use ukify; then echo "uki_generator=ukify" >> "${T}/install.conf" || die + else + if ! use dracut; then + echo "uki_generator=none" >> "${T}/install.conf" || die + fi fi if [[ -s "${T}/install.conf" ]]; then