[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/

[Andrew Ammerlaan]

commit:     ec00b7c50c51d05c2b576d3670e91ffc1e2dd4f8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 11:44:08 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <andrewammerlaan <AT> 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