* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-03 7:37 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 5fdbb828a620a73f9fca0a5ce76c113f57ad4e13
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 07:37:04 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 07:37:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdbb828
sys-kernel/installkernel: drop 44
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-44.ebuild | 231 -----------------------
2 files changed, 232 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6a5818453480..5f9213382545 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-DIST installkernel-44.tar.gz 24868 BLAKE2B 555af1b225e6562b8ff7c53891ef0da1fb085c20d9e5c2fb1e05f7853aaddde316ff5a33865dfc77c1e313b0157fba28aa6ac80ba3aec41d8d2cedf031111a23 SHA512 73c4c51dbfba204a17f1f4dea87e15ab268462c87d2d2ae2a20d1f78e599dac6b3ca503c8e299df3aa1697815332dcea9779c3c8291c1d47e24fd1ed3a8752f8
DIST installkernel-45.tar.gz 25015 BLAKE2B 295a2c0e00c09ed06f93af4fb2e7b257bddba94d267630dadb25771fb84cc8e47cec6b6c4a45b0447af126ad05057e68626c03c7caf9cad7df47eb77e3c61500 SHA512 195eb7dcd33aa0ff7c29479a5981c72c49a9ca710823413932ae53d505d44da35a488cffe4b0be0852484a5528131ee5c9627128f375bfb1a8697b159a06d33d
diff --git a/sys-kernel/installkernel/installkernel-44.ebuild b/sys-kernel/installkernel/installkernel-44.ebuild
deleted file mode 100644
index 154cb6ca7a18..000000000000
--- a/sys-kernel/installkernel/installkernel-44.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- doexe hooks/99-check-diskspace.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- doexe hooks/99-write-log.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/85-check-diskspace.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- doexe hooks/systemd/99-write-log.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-
- # Initialize log file if there is none
- local log=${ROOT}/var/log/installkernel.log
- if [[ ! -f ${log} ]]; then
- echo -e \
-"DATE\t"\
-"KI_VENDOR\t"\
-"VERSION\t"\
-"CONF_ROOT\t"\
-"LAYOUT\t"\
-"INITRD_GEN\t"\
-"UKI_GEN\t"\
-"BOOT_ROOT\t"\
-"KERNEL_REL_PATH\t"\
-"INITRD_REL_PATH\t"\
-"PLUGIN_OVERRIDE\t"\
->> "${log}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-10-24 14:54 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-10-24 14:54 UTC (permalink / raw
To: gentoo-commits
commit: a7da8bb299a77f818422af8767b3df642c989990
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 24 14:51:00 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 14:53:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7da8bb2
sys-kernel/installkernel: make efistub check non-fatal
See-also: https://forums.gentoo.org/viewtopic-p-8844014.html
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-48-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-48-r1.ebuild b/sys-kernel/installkernel/installkernel-48-r1.ebuild
index 08c53150d2f6..62c21454e7fb 100644
--- a/sys-kernel/installkernel/installkernel-48-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-48-r1.ebuild
@@ -90,7 +90,7 @@ RDEPEND="
" # Block against systemd that still installs dummy install.conf
pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+ use efistub && CONFIG_CHECK="~EFI_STUB" linux-info_pkg_setup
}
src_install() {
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-09-05 7:46 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-09-05 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 9dc6b37757f53edec71c464576a1c1d5c485073e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 07:44:45 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 07:44:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc6b377
sys-kernel/installkernel: drop 39-r2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
.../installkernel/installkernel-39-r2.ebuild | 208 ---------------------
2 files changed, 209 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 93867b4676d1..3287dd885a1f 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1 @@
-DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-48.tar.gz 25079 BLAKE2B 73bf66071dc7dd76afd1ee42d4c3528430f2b00e38c94ff274d6af78c302243fe33959b721c29435819feeed56d94fb1d6f9381b92d8718acee1d9934cfbf5b8 SHA512 302ec0657564dfe3f8d02f564f39a1d7203dcb81d9dd748d3b0b30b0c73b8e9d94758f53076d7b685f57f2a3beeec1a75ad5f807b91200a2f0a2de5510191cb1
diff --git a/sys-kernel/installkernel/installkernel-39-r2.ebuild b/sys-kernel/installkernel/installkernel-39-r2.ebuild
deleted file mode 100644
index 2b11a30d57c5..000000000000
--- a/sys-kernel/installkernel/installkernel-39-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-09-05 7:46 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-09-05 7:46 UTC (permalink / raw
To: gentoo-commits
commit: e6676a0a1f474b9504616eec7800bf6d30d047a6
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 07:44:27 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 07:44:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6676a0a
sys-kernel/installkernel: stabilize 48-r1 for ALLARCHES
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-48-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-48-r1.ebuild b/sys-kernel/installkernel/installkernel-48-r1.ebuild
index f41ce9300a2e..a1c321d6558d 100644
--- a/sys-kernel/installkernel/installkernel-48-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-48-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
REQUIRED_USE="
?? ( efistub grub systemd-boot )
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-05 14:58 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-05 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 33066af9e29dd35b96c3154271203811ad035d8d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 14:47:29 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 14:58:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33066af9
sys-kernel/installkernel: ensure /var/lib/misc exists
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{installkernel-48.ebuild => installkernel-48-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-kernel/installkernel/installkernel-48.ebuild b/sys-kernel/installkernel/installkernel-48-r1.ebuild
similarity index 99%
rename from sys-kernel/installkernel/installkernel-48.ebuild
rename to sys-kernel/installkernel/installkernel-48-r1.ebuild
index 5a8924a19afa..f41ce9300a2e 100644
--- a/sys-kernel/installkernel/installkernel-48.ebuild
+++ b/sys-kernel/installkernel/installkernel-48-r1.ebuild
@@ -171,6 +171,7 @@ src_install() {
insinto /etc/logrotate.d
newins installkernel.logrotate installkernel
+ keepdir /var/lib/misc
into /
dosbin installkernel
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-05 14:28 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-05 14:28 UTC (permalink / raw
To: gentoo-commits
commit: b01bf093d3458b7436697f3aa06d431720397af1
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 14:27:58 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 14:27:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01bf093
sys-kernel/installkernel: drop 47
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-47.ebuild | 238 -----------------------
2 files changed, 239 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 010f5a85e62d..93867b4676d1 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-DIST installkernel-47.tar.gz 25073 BLAKE2B 92c60c4bd9691f046821a65fc1f3216b1c6c65ed96fad9f917fa44cd58f11fddb99f8254209aa00dfa11719812e605225a8675cc0204cd53851b5b21c49065a6 SHA512 1ed109d2ae8d1b5c2018bc78e43ab0f516305a3ec6ee666ee38ed6d0603ca426eebd01b36804728d0b91c8772fa35483f2971a11d09e9b454763a7f238136774
DIST installkernel-48.tar.gz 25079 BLAKE2B 73bf66071dc7dd76afd1ee42d4c3528430f2b00e38c94ff274d6af78c302243fe33959b721c29435819feeed56d94fb1d6f9381b92d8718acee1d9934cfbf5b8 SHA512 302ec0657564dfe3f8d02f564f39a1d7203dcb81d9dd748d3b0b30b0c73b8e9d94758f53076d7b685f57f2a3beeec1a75ad5f807b91200a2f0a2de5510191cb1
diff --git a/sys-kernel/installkernel/installkernel-47.ebuild b/sys-kernel/installkernel/installkernel-47.ebuild
deleted file mode 100644
index 5a8924a19afa..000000000000
--- a/sys-kernel/installkernel/installkernel-47.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/install.d
- keepdir /etc/kernel/preinst.d
- keepdir /etc/kernel/postinst.d
- keepdir /usr/lib/kernel/install.d
- keepdir /usr/lib/kernel/preinst.d
- keepdir /usr/lib/kernel/postinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- doexe hooks/99-check-diskspace.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- doexe hooks/99-write-log.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/85-check-diskspace.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- doexe hooks/systemd/99-write-log.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- insinto /etc/logrotate.d
- newins installkernel.logrotate installkernel
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-
- # Initialize log file if there is none
- local log=${ROOT}/var/log/installkernel.log
- if [[ ! -f ${log} ]]; then
- echo -e \
-"DATE\t"\
-"KI_VENDOR\t"\
-"VERSION\t"\
-"CONF_ROOT\t"\
-"LAYOUT\t"\
-"INITRD_GEN\t"\
-"UKI_GEN\t"\
-"BOOT_ROOT\t"\
-"KERNEL_REL_PATH\t"\
-"INITRD_REL_PATH\t"\
-"PLUGIN_OVERRIDE\t"\
->> "${log}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-05 14:28 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-05 14:28 UTC (permalink / raw
To: gentoo-commits
commit: b6dee6f90941fd4c2d0330abdc2a6acb14c9a3f9
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 14:27:46 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 14:27:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6dee6f9
sys-kernel/installkernel: add 48
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-48.ebuild | 238 +++++++++++++++++++++++
2 files changed, 239 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index c2402a6fbb58..010f5a85e62d 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-47.tar.gz 25073 BLAKE2B 92c60c4bd9691f046821a65fc1f3216b1c6c65ed96fad9f917fa44cd58f11fddb99f8254209aa00dfa11719812e605225a8675cc0204cd53851b5b21c49065a6 SHA512 1ed109d2ae8d1b5c2018bc78e43ab0f516305a3ec6ee666ee38ed6d0603ca426eebd01b36804728d0b91c8772fa35483f2971a11d09e9b454763a7f238136774
+DIST installkernel-48.tar.gz 25079 BLAKE2B 73bf66071dc7dd76afd1ee42d4c3528430f2b00e38c94ff274d6af78c302243fe33959b721c29435819feeed56d94fb1d6f9381b92d8718acee1d9934cfbf5b8 SHA512 302ec0657564dfe3f8d02f564f39a1d7203dcb81d9dd748d3b0b30b0c73b8e9d94758f53076d7b685f57f2a3beeec1a75ad5f807b91200a2f0a2de5510191cb1
diff --git a/sys-kernel/installkernel/installkernel-48.ebuild b/sys-kernel/installkernel/installkernel-48.ebuild
new file mode 100644
index 000000000000..5a8924a19afa
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-48.ebuild
@@ -0,0 +1,238 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/install.d
+ keepdir /etc/kernel/preinst.d
+ keepdir /etc/kernel/postinst.d
+ keepdir /usr/lib/kernel/install.d
+ keepdir /usr/lib/kernel/preinst.d
+ keepdir /usr/lib/kernel/postinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ insinto /etc/logrotate.d
+ newins installkernel.logrotate installkernel
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+"DATE\t"\
+"KI_VENDOR\t"\
+"VERSION\t"\
+"CONF_ROOT\t"\
+"LAYOUT\t"\
+"INITRD_GEN\t"\
+"UKI_GEN\t"\
+"BOOT_ROOT\t"\
+"KERNEL_REL_PATH\t"\
+"INITRD_REL_PATH\t"\
+"PLUGIN_OVERRIDE\t"\
+>> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-03 15:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 0f97af10e6ad3b9fbb35970499740073cceb145e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 15:57:53 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 15:58:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f97af10
sys-kernel/installkernel: add 47
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-47.ebuild | 238 +++++++++++++++++++++++
2 files changed, 239 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 0357ab8f5f0b..8dd92cde6a92 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-46.tar.gz 25076 BLAKE2B 78bb1f78de46dcd5ce61e51ee60051761821e89b9d498fd2e9b63c4daf21378cb8e3b9faef482e32b3824d256e76fcfe1b8a33aeef9277a376cae59d4a8cd631 SHA512 1d31b6cc328e08f739a4d7835dedfbfe5dc504cf784144306911d60fc5e8d90fe4dca5d179d86f1d8da092e607ec183e38931bb5b5edac7a16bd422e6d4029de
+DIST installkernel-47.tar.gz 25073 BLAKE2B 92c60c4bd9691f046821a65fc1f3216b1c6c65ed96fad9f917fa44cd58f11fddb99f8254209aa00dfa11719812e605225a8675cc0204cd53851b5b21c49065a6 SHA512 1ed109d2ae8d1b5c2018bc78e43ab0f516305a3ec6ee666ee38ed6d0603ca426eebd01b36804728d0b91c8772fa35483f2971a11d09e9b454763a7f238136774
diff --git a/sys-kernel/installkernel/installkernel-47.ebuild b/sys-kernel/installkernel/installkernel-47.ebuild
new file mode 100644
index 000000000000..5a8924a19afa
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-47.ebuild
@@ -0,0 +1,238 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/install.d
+ keepdir /etc/kernel/preinst.d
+ keepdir /etc/kernel/postinst.d
+ keepdir /usr/lib/kernel/install.d
+ keepdir /usr/lib/kernel/preinst.d
+ keepdir /usr/lib/kernel/postinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ insinto /etc/logrotate.d
+ newins installkernel.logrotate installkernel
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+"DATE\t"\
+"KI_VENDOR\t"\
+"VERSION\t"\
+"CONF_ROOT\t"\
+"LAYOUT\t"\
+"INITRD_GEN\t"\
+"UKI_GEN\t"\
+"BOOT_ROOT\t"\
+"KERNEL_REL_PATH\t"\
+"INITRD_REL_PATH\t"\
+"PLUGIN_OVERRIDE\t"\
+>> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-03 15:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 139b373b8200176f20b396aac47a3a8daf7a7c95
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 15:58:03 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 15:58:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139b373b
sys-kernel/installkernel: drop 46
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-46.ebuild | 238 -----------------------
2 files changed, 239 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 8dd92cde6a92..c2402a6fbb58 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-DIST installkernel-46.tar.gz 25076 BLAKE2B 78bb1f78de46dcd5ce61e51ee60051761821e89b9d498fd2e9b63c4daf21378cb8e3b9faef482e32b3824d256e76fcfe1b8a33aeef9277a376cae59d4a8cd631 SHA512 1d31b6cc328e08f739a4d7835dedfbfe5dc504cf784144306911d60fc5e8d90fe4dca5d179d86f1d8da092e607ec183e38931bb5b5edac7a16bd422e6d4029de
DIST installkernel-47.tar.gz 25073 BLAKE2B 92c60c4bd9691f046821a65fc1f3216b1c6c65ed96fad9f917fa44cd58f11fddb99f8254209aa00dfa11719812e605225a8675cc0204cd53851b5b21c49065a6 SHA512 1ed109d2ae8d1b5c2018bc78e43ab0f516305a3ec6ee666ee38ed6d0603ca426eebd01b36804728d0b91c8772fa35483f2971a11d09e9b454763a7f238136774
diff --git a/sys-kernel/installkernel/installkernel-46.ebuild b/sys-kernel/installkernel/installkernel-46.ebuild
deleted file mode 100644
index 5a8924a19afa..000000000000
--- a/sys-kernel/installkernel/installkernel-46.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/install.d
- keepdir /etc/kernel/preinst.d
- keepdir /etc/kernel/postinst.d
- keepdir /usr/lib/kernel/install.d
- keepdir /usr/lib/kernel/preinst.d
- keepdir /usr/lib/kernel/postinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- doexe hooks/99-check-diskspace.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- doexe hooks/99-write-log.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/85-check-diskspace.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- doexe hooks/systemd/99-write-log.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- insinto /etc/logrotate.d
- newins installkernel.logrotate installkernel
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-
- # Initialize log file if there is none
- local log=${ROOT}/var/log/installkernel.log
- if [[ ! -f ${log} ]]; then
- echo -e \
-"DATE\t"\
-"KI_VENDOR\t"\
-"VERSION\t"\
-"CONF_ROOT\t"\
-"LAYOUT\t"\
-"INITRD_GEN\t"\
-"UKI_GEN\t"\
-"BOOT_ROOT\t"\
-"KERNEL_REL_PATH\t"\
-"INITRD_REL_PATH\t"\
-"PLUGIN_OVERRIDE\t"\
->> "${log}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-03 9:21 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 68a85ea6f98ac87e96d73c51deccb43edf99280b
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 09:20:38 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 09:21:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a85ea6
sys-kernel/installkernel: drop 45
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-45.ebuild | 238 -----------------------
2 files changed, 239 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6908be2ba9b2..0357ab8f5f0b 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-DIST installkernel-45.tar.gz 25015 BLAKE2B 295a2c0e00c09ed06f93af4fb2e7b257bddba94d267630dadb25771fb84cc8e47cec6b6c4a45b0447af126ad05057e68626c03c7caf9cad7df47eb77e3c61500 SHA512 195eb7dcd33aa0ff7c29479a5981c72c49a9ca710823413932ae53d505d44da35a488cffe4b0be0852484a5528131ee5c9627128f375bfb1a8697b159a06d33d
DIST installkernel-46.tar.gz 25076 BLAKE2B 78bb1f78de46dcd5ce61e51ee60051761821e89b9d498fd2e9b63c4daf21378cb8e3b9faef482e32b3824d256e76fcfe1b8a33aeef9277a376cae59d4a8cd631 SHA512 1d31b6cc328e08f739a4d7835dedfbfe5dc504cf784144306911d60fc5e8d90fe4dca5d179d86f1d8da092e607ec183e38931bb5b5edac7a16bd422e6d4029de
diff --git a/sys-kernel/installkernel/installkernel-45.ebuild b/sys-kernel/installkernel/installkernel-45.ebuild
deleted file mode 100644
index 5a8924a19afa..000000000000
--- a/sys-kernel/installkernel/installkernel-45.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/install.d
- keepdir /etc/kernel/preinst.d
- keepdir /etc/kernel/postinst.d
- keepdir /usr/lib/kernel/install.d
- keepdir /usr/lib/kernel/preinst.d
- keepdir /usr/lib/kernel/postinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- doexe hooks/99-check-diskspace.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- doexe hooks/99-write-log.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/85-check-diskspace.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- doexe hooks/systemd/99-write-log.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- insinto /etc/logrotate.d
- newins installkernel.logrotate installkernel
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-
- # Initialize log file if there is none
- local log=${ROOT}/var/log/installkernel.log
- if [[ ! -f ${log} ]]; then
- echo -e \
-"DATE\t"\
-"KI_VENDOR\t"\
-"VERSION\t"\
-"CONF_ROOT\t"\
-"LAYOUT\t"\
-"INITRD_GEN\t"\
-"UKI_GEN\t"\
-"BOOT_ROOT\t"\
-"KERNEL_REL_PATH\t"\
-"INITRD_REL_PATH\t"\
-"PLUGIN_OVERRIDE\t"\
->> "${log}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-03 9:21 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 40f7537cfadd4aa78a90c82a310b540fb9074031
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 09:20:24 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 09:21:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f7537c
sys-kernel/installkernel: add 46
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-46.ebuild | 238 +++++++++++++++++++++++
2 files changed, 239 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 5f9213382545..6908be2ba9b2 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-45.tar.gz 25015 BLAKE2B 295a2c0e00c09ed06f93af4fb2e7b257bddba94d267630dadb25771fb84cc8e47cec6b6c4a45b0447af126ad05057e68626c03c7caf9cad7df47eb77e3c61500 SHA512 195eb7dcd33aa0ff7c29479a5981c72c49a9ca710823413932ae53d505d44da35a488cffe4b0be0852484a5528131ee5c9627128f375bfb1a8697b159a06d33d
+DIST installkernel-46.tar.gz 25076 BLAKE2B 78bb1f78de46dcd5ce61e51ee60051761821e89b9d498fd2e9b63c4daf21378cb8e3b9faef482e32b3824d256e76fcfe1b8a33aeef9277a376cae59d4a8cd631 SHA512 1d31b6cc328e08f739a4d7835dedfbfe5dc504cf784144306911d60fc5e8d90fe4dca5d179d86f1d8da092e607ec183e38931bb5b5edac7a16bd422e6d4029de
diff --git a/sys-kernel/installkernel/installkernel-46.ebuild b/sys-kernel/installkernel/installkernel-46.ebuild
new file mode 100644
index 000000000000..5a8924a19afa
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-46.ebuild
@@ -0,0 +1,238 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/install.d
+ keepdir /etc/kernel/preinst.d
+ keepdir /etc/kernel/postinst.d
+ keepdir /usr/lib/kernel/install.d
+ keepdir /usr/lib/kernel/preinst.d
+ keepdir /usr/lib/kernel/postinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ insinto /etc/logrotate.d
+ newins installkernel.logrotate installkernel
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+"DATE\t"\
+"KI_VENDOR\t"\
+"VERSION\t"\
+"CONF_ROOT\t"\
+"LAYOUT\t"\
+"INITRD_GEN\t"\
+"UKI_GEN\t"\
+"BOOT_ROOT\t"\
+"KERNEL_REL_PATH\t"\
+"INITRD_REL_PATH\t"\
+"PLUGIN_OVERRIDE\t"\
+>> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-08-03 7:37 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 9d0abea8f7ac288f724e5de1ec7e1a6b58d76e9a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 07:32:02 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 07:35:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0abea8
sys-kernel/installkernel: add 45
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-45.ebuild | 238 +++++++++++++++++++++++
2 files changed, 239 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 2a22ddd77f01..6a5818453480 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-44.tar.gz 24868 BLAKE2B 555af1b225e6562b8ff7c53891ef0da1fb085c20d9e5c2fb1e05f7853aaddde316ff5a33865dfc77c1e313b0157fba28aa6ac80ba3aec41d8d2cedf031111a23 SHA512 73c4c51dbfba204a17f1f4dea87e15ab268462c87d2d2ae2a20d1f78e599dac6b3ca503c8e299df3aa1697815332dcea9779c3c8291c1d47e24fd1ed3a8752f8
+DIST installkernel-45.tar.gz 25015 BLAKE2B 295a2c0e00c09ed06f93af4fb2e7b257bddba94d267630dadb25771fb84cc8e47cec6b6c4a45b0447af126ad05057e68626c03c7caf9cad7df47eb77e3c61500 SHA512 195eb7dcd33aa0ff7c29479a5981c72c49a9ca710823413932ae53d505d44da35a488cffe4b0be0852484a5528131ee5c9627128f375bfb1a8697b159a06d33d
diff --git a/sys-kernel/installkernel/installkernel-45.ebuild b/sys-kernel/installkernel/installkernel-45.ebuild
new file mode 100644
index 000000000000..5a8924a19afa
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-45.ebuild
@@ -0,0 +1,238 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/install.d
+ keepdir /etc/kernel/preinst.d
+ keepdir /etc/kernel/postinst.d
+ keepdir /usr/lib/kernel/install.d
+ keepdir /usr/lib/kernel/preinst.d
+ keepdir /usr/lib/kernel/postinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ insinto /etc/logrotate.d
+ newins installkernel.logrotate installkernel
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+"DATE\t"\
+"KI_VENDOR\t"\
+"VERSION\t"\
+"CONF_ROOT\t"\
+"LAYOUT\t"\
+"INITRD_GEN\t"\
+"UKI_GEN\t"\
+"BOOT_ROOT\t"\
+"KERNEL_REL_PATH\t"\
+"INITRD_REL_PATH\t"\
+"PLUGIN_OVERRIDE\t"\
+>> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-31 7:21 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-31 7:21 UTC (permalink / raw
To: gentoo-commits
commit: c49d396e828e060d2d9c62f0c78db18ed97dfc68
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 07:20:02 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 07:20:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49d396e
sys-kernel/installkernel: drop 43
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-43.ebuild | 231 -----------------------
2 files changed, 232 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 1353cdb39881..2a22ddd77f01 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-DIST installkernel-43.tar.gz 24805 BLAKE2B 83c4c884157181509118d3df9e58e7177f195e7ee5379cf1e740d7971024e1e07fdb89a6736deb48989be4b8b579e9e7188df1cf86f36e8cd370250ef01f6354 SHA512 b1a0fb33babc273b3bb98a146e0bb4fc1f8ace97f2bdded34cdcadb8939265b30acb074d6acb812f8f965d13e4248d158a89aa11b502ad942c5d2c9df2b615a1
DIST installkernel-44.tar.gz 24868 BLAKE2B 555af1b225e6562b8ff7c53891ef0da1fb085c20d9e5c2fb1e05f7853aaddde316ff5a33865dfc77c1e313b0157fba28aa6ac80ba3aec41d8d2cedf031111a23 SHA512 73c4c51dbfba204a17f1f4dea87e15ab268462c87d2d2ae2a20d1f78e599dac6b3ca503c8e299df3aa1697815332dcea9779c3c8291c1d47e24fd1ed3a8752f8
diff --git a/sys-kernel/installkernel/installkernel-43.ebuild b/sys-kernel/installkernel/installkernel-43.ebuild
deleted file mode 100644
index 154cb6ca7a18..000000000000
--- a/sys-kernel/installkernel/installkernel-43.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- doexe hooks/99-check-diskspace.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- doexe hooks/99-write-log.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/85-check-diskspace.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- doexe hooks/systemd/99-write-log.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-
- # Initialize log file if there is none
- local log=${ROOT}/var/log/installkernel.log
- if [[ ! -f ${log} ]]; then
- echo -e \
-"DATE\t"\
-"KI_VENDOR\t"\
-"VERSION\t"\
-"CONF_ROOT\t"\
-"LAYOUT\t"\
-"INITRD_GEN\t"\
-"UKI_GEN\t"\
-"BOOT_ROOT\t"\
-"KERNEL_REL_PATH\t"\
-"INITRD_REL_PATH\t"\
-"PLUGIN_OVERRIDE\t"\
->> "${log}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-31 7:21 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-31 7:21 UTC (permalink / raw
To: gentoo-commits
commit: ded39d5b7a20f7997d2a2d7ed364cea4b8bede60
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 07:19:40 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 07:20:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded39d5b
sys-kernel/installkernel: add 44
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-44.ebuild | 231 +++++++++++++++++++++++
2 files changed, 232 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 971f0a75a80e..1353cdb39881 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-43.tar.gz 24805 BLAKE2B 83c4c884157181509118d3df9e58e7177f195e7ee5379cf1e740d7971024e1e07fdb89a6736deb48989be4b8b579e9e7188df1cf86f36e8cd370250ef01f6354 SHA512 b1a0fb33babc273b3bb98a146e0bb4fc1f8ace97f2bdded34cdcadb8939265b30acb074d6acb812f8f965d13e4248d158a89aa11b502ad942c5d2c9df2b615a1
+DIST installkernel-44.tar.gz 24868 BLAKE2B 555af1b225e6562b8ff7c53891ef0da1fb085c20d9e5c2fb1e05f7853aaddde316ff5a33865dfc77c1e313b0157fba28aa6ac80ba3aec41d8d2cedf031111a23 SHA512 73c4c51dbfba204a17f1f4dea87e15ab268462c87d2d2ae2a20d1f78e599dac6b3ca503c8e299df3aa1697815332dcea9779c3c8291c1d47e24fd1ed3a8752f8
diff --git a/sys-kernel/installkernel/installkernel-44.ebuild b/sys-kernel/installkernel/installkernel-44.ebuild
new file mode 100644
index 000000000000..154cb6ca7a18
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-44.ebuild
@@ -0,0 +1,231 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+"DATE\t"\
+"KI_VENDOR\t"\
+"VERSION\t"\
+"CONF_ROOT\t"\
+"LAYOUT\t"\
+"INITRD_GEN\t"\
+"UKI_GEN\t"\
+"BOOT_ROOT\t"\
+"KERNEL_REL_PATH\t"\
+"INITRD_REL_PATH\t"\
+"PLUGIN_OVERRIDE\t"\
+>> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-30 18:25 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-30 18:25 UTC (permalink / raw
To: gentoo-commits
commit: cb86619ffaf1ec008003ddd7071ccef5a1c118a2
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 18:25:15 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 18:25:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb86619f
sys-kernel/installkernel: drop 40, 41, 42
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 3 -
sys-kernel/installkernel/installkernel-40.ebuild | 209 --------------------
sys-kernel/installkernel/installkernel-41.ebuild | 209 --------------------
sys-kernel/installkernel/installkernel-42.ebuild | 231 -----------------------
4 files changed, 652 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 657834a936c9..971f0a75a80e 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,5 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-DIST installkernel-40.tar.gz 22667 BLAKE2B cc3dd370428fa2e2b585feb9743db16bfa6f81bc869de366ea280837b865cff847cc12344db476650a79cca48ab839949c8f9d699ea0cdf68d27c7ccd009357a SHA512 a1302b63ec1a4cd3cc16f8ee5bbd7c209075964bea0963a355bbfd8513898f3c33ddc0150f43bcd0007166e93a72569ba55c75b8234db004a3d52b410714a4c1
-DIST installkernel-41.tar.gz 22894 BLAKE2B f1baa8b56f168e39ebeb39c4f51a1bb5ebf9f90974b57b39f53cad88bc655a3959470ea4b80f982407e48e403e4e5190f986f1cc9293daf0eb1989e8eedb89f9 SHA512 abfaf6ffd00da654682d4ea55119bedc48e40dbbfc90fb6ae015cb38b8906be56247bf776a8bf32f002851963ac31c40c9e69067a04abac673c5753deccdc9b7
-DIST installkernel-42.tar.gz 24786 BLAKE2B 9ce4bd3e823420d5e328560946dc62490e6281397ccd67e8a2edc11efd971e015f5195678de0c6975d4735dcf95de4ec9cbac217ffda97738337b33d750e3351 SHA512 774d52a2656575f0305c5b9b2deecc0f7e8e6064da09f2ddd30cf162fe5597b0bee9028ec983107b7baad3f35eca8542ec819c1e499cbfd27286f393791914ae
DIST installkernel-43.tar.gz 24805 BLAKE2B 83c4c884157181509118d3df9e58e7177f195e7ee5379cf1e740d7971024e1e07fdb89a6736deb48989be4b8b579e9e7188df1cf86f36e8cd370250ef01f6354 SHA512 b1a0fb33babc273b3bb98a146e0bb4fc1f8ace97f2bdded34cdcadb8939265b30acb074d6acb812f8f965d13e4248d158a89aa11b502ad942c5d2c9df2b615a1
diff --git a/sys-kernel/installkernel/installkernel-40.ebuild b/sys-kernel/installkernel/installkernel-40.ebuild
deleted file mode 100644
index db93b183f69a..000000000000
--- a/sys-kernel/installkernel/installkernel-40.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
diff --git a/sys-kernel/installkernel/installkernel-41.ebuild b/sys-kernel/installkernel/installkernel-41.ebuild
deleted file mode 100644
index db93b183f69a..000000000000
--- a/sys-kernel/installkernel/installkernel-41.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
diff --git a/sys-kernel/installkernel/installkernel-42.ebuild b/sys-kernel/installkernel/installkernel-42.ebuild
deleted file mode 100644
index 5eb2a80df624..000000000000
--- a/sys-kernel/installkernel/installkernel-42.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
-REQUIRED_USE="
- ?? ( efistub grub systemd-boot )
- refind? ( !systemd-boot !grub )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( dracut ugrd )
-"
-# Only select one flag that sets "layout=", except for uki since grub,
-# systemd-boot, and efistub booting are all compatible with UKIs and
-# the uki layout.
-#
-# Refind does not set a layout=, it is compatible with the compat, uki
-# and efistub layout. So block against only grub and systemd-boot.
-#
-# systemd-boot could be made to work without the systemd flag, but this
-# makes no sense since in systemd(-utils) the boot flag already
-# requires the kernel-install flag.
-#
-# Ukify hooks do nothing if the layout is not uki, so force this here.
-#
-# Only one initramfs generator flag can be selected. Note that while
-# both dracut and ukify are UKI generators we don't block those because
-# enabling both results in building an initramfs only with dracut and
-# building an UKI with ukify, which is a valid configuration.
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- ugrd? ( sys-kernel/ugrd )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- doexe hooks/99-check-diskspace.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- doexe hooks/99-write-log.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/85-check-diskspace.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/90-zz-update-static.install
- doexe hooks/systemd/99-write-log.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- fi
- elif use ugrd; then
- echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-
- # Initialize log file if there is none
- local log=${ROOT}/var/log/installkernel.log
- if [[ ! -f ${log} ]]; then
- echo -e \
- "DATE\t" \
- "KI_VENDOR\t" \
- "VERSION\t" \
- "CONF_ROOT\t" \
- "LAYOUT\t" \
- "INITRD_GEN\t" \
- "UKI_GEN\t" \
- "BOOT_ROOT\t" \
- "KERNEL_REL_PATH\t" \
- "INITRD_REL_PATH\t" \
- "PLUGIN_OVERRIDE\t" \
- >> "${log}" || die
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-30 18:24 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-30 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 736ce8030bfae90b701361f63933fd96d6952297
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 18:22:28 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 18:24:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736ce803
sys-kernel/installkernel: add 43
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-43.ebuild | 231 +++++++++++++++++++++++
2 files changed, 232 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index dc98d94b4e96..657834a936c9 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -2,3 +2,4 @@ DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d42856843549
DIST installkernel-40.tar.gz 22667 BLAKE2B cc3dd370428fa2e2b585feb9743db16bfa6f81bc869de366ea280837b865cff847cc12344db476650a79cca48ab839949c8f9d699ea0cdf68d27c7ccd009357a SHA512 a1302b63ec1a4cd3cc16f8ee5bbd7c209075964bea0963a355bbfd8513898f3c33ddc0150f43bcd0007166e93a72569ba55c75b8234db004a3d52b410714a4c1
DIST installkernel-41.tar.gz 22894 BLAKE2B f1baa8b56f168e39ebeb39c4f51a1bb5ebf9f90974b57b39f53cad88bc655a3959470ea4b80f982407e48e403e4e5190f986f1cc9293daf0eb1989e8eedb89f9 SHA512 abfaf6ffd00da654682d4ea55119bedc48e40dbbfc90fb6ae015cb38b8906be56247bf776a8bf32f002851963ac31c40c9e69067a04abac673c5753deccdc9b7
DIST installkernel-42.tar.gz 24786 BLAKE2B 9ce4bd3e823420d5e328560946dc62490e6281397ccd67e8a2edc11efd971e015f5195678de0c6975d4735dcf95de4ec9cbac217ffda97738337b33d750e3351 SHA512 774d52a2656575f0305c5b9b2deecc0f7e8e6064da09f2ddd30cf162fe5597b0bee9028ec983107b7baad3f35eca8542ec819c1e499cbfd27286f393791914ae
+DIST installkernel-43.tar.gz 24805 BLAKE2B 83c4c884157181509118d3df9e58e7177f195e7ee5379cf1e740d7971024e1e07fdb89a6736deb48989be4b8b579e9e7188df1cf86f36e8cd370250ef01f6354 SHA512 b1a0fb33babc273b3bb98a146e0bb4fc1f8ace97f2bdded34cdcadb8939265b30acb074d6acb812f8f965d13e4248d158a89aa11b502ad942c5d2c9df2b615a1
diff --git a/sys-kernel/installkernel/installkernel-43.ebuild b/sys-kernel/installkernel/installkernel-43.ebuild
new file mode 100644
index 000000000000..154cb6ca7a18
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-43.ebuild
@@ -0,0 +1,231 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+"DATE\t"\
+"KI_VENDOR\t"\
+"VERSION\t"\
+"CONF_ROOT\t"\
+"LAYOUT\t"\
+"INITRD_GEN\t"\
+"UKI_GEN\t"\
+"BOOT_ROOT\t"\
+"KERNEL_REL_PATH\t"\
+"INITRD_REL_PATH\t"\
+"PLUGIN_OVERRIDE\t"\
+>> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-30 17:55 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-30 17:55 UTC (permalink / raw
To: gentoo-commits
commit: d945ba01463f2a09ca5244de0a5574c6a07ac3e2
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 17:52:39 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 17:55:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d945ba01
sys-kernel/installkernel: add 42
this release adds disk space checks to ensure we don't confuse the bootloader
with incomplete kernels and adds basic logging to /var/log/installkernel.log
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-42.ebuild | 231 +++++++++++++++++++++++
2 files changed, 232 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index c16fcadb80e1..dc98d94b4e96 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-40.tar.gz 22667 BLAKE2B cc3dd370428fa2e2b585feb9743db16bfa6f81bc869de366ea280837b865cff847cc12344db476650a79cca48ab839949c8f9d699ea0cdf68d27c7ccd009357a SHA512 a1302b63ec1a4cd3cc16f8ee5bbd7c209075964bea0963a355bbfd8513898f3c33ddc0150f43bcd0007166e93a72569ba55c75b8234db004a3d52b410714a4c1
DIST installkernel-41.tar.gz 22894 BLAKE2B f1baa8b56f168e39ebeb39c4f51a1bb5ebf9f90974b57b39f53cad88bc655a3959470ea4b80f982407e48e403e4e5190f986f1cc9293daf0eb1989e8eedb89f9 SHA512 abfaf6ffd00da654682d4ea55119bedc48e40dbbfc90fb6ae015cb38b8906be56247bf776a8bf32f002851963ac31c40c9e69067a04abac673c5753deccdc9b7
+DIST installkernel-42.tar.gz 24786 BLAKE2B 9ce4bd3e823420d5e328560946dc62490e6281397ccd67e8a2edc11efd971e015f5195678de0c6975d4735dcf95de4ec9cbac217ffda97738337b33d750e3351 SHA512 774d52a2656575f0305c5b9b2deecc0f7e8e6064da09f2ddd30cf162fe5597b0bee9028ec983107b7baad3f35eca8542ec819c1e499cbfd27286f393791914ae
diff --git a/sys-kernel/installkernel/installkernel-42.ebuild b/sys-kernel/installkernel/installkernel-42.ebuild
new file mode 100644
index 000000000000..5eb2a80df624
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-42.ebuild
@@ -0,0 +1,231 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/99-check-diskspace.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ doexe hooks/99-write-log.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/85-check-diskspace.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ doexe hooks/systemd/99-write-log.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+
+ # Initialize log file if there is none
+ local log=${ROOT}/var/log/installkernel.log
+ if [[ ! -f ${log} ]]; then
+ echo -e \
+ "DATE\t" \
+ "KI_VENDOR\t" \
+ "VERSION\t" \
+ "CONF_ROOT\t" \
+ "LAYOUT\t" \
+ "INITRD_GEN\t" \
+ "UKI_GEN\t" \
+ "BOOT_ROOT\t" \
+ "KERNEL_REL_PATH\t" \
+ "INITRD_REL_PATH\t" \
+ "PLUGIN_OVERRIDE\t" \
+ >> "${log}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-26 20:36 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-26 20:36 UTC (permalink / raw
To: gentoo-commits
commit: 95696a45e544c54dddb5c45c7891d06d83bfe943
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 20:28:08 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 20:28:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95696a45
sys-kernel/installkernel: add 41
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-41.ebuild | 209 +++++++++++++++++++++++
2 files changed, 210 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 1a278273bf14..c16fcadb80e1 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
DIST installkernel-40.tar.gz 22667 BLAKE2B cc3dd370428fa2e2b585feb9743db16bfa6f81bc869de366ea280837b865cff847cc12344db476650a79cca48ab839949c8f9d699ea0cdf68d27c7ccd009357a SHA512 a1302b63ec1a4cd3cc16f8ee5bbd7c209075964bea0963a355bbfd8513898f3c33ddc0150f43bcd0007166e93a72569ba55c75b8234db004a3d52b410714a4c1
+DIST installkernel-41.tar.gz 22894 BLAKE2B f1baa8b56f168e39ebeb39c4f51a1bb5ebf9f90974b57b39f53cad88bc655a3959470ea4b80f982407e48e403e4e5190f986f1cc9293daf0eb1989e8eedb89f9 SHA512 abfaf6ffd00da654682d4ea55119bedc48e40dbbfc90fb6ae015cb38b8906be56247bf776a8bf32f002851963ac31c40c9e69067a04abac673c5753deccdc9b7
diff --git a/sys-kernel/installkernel/installkernel-41.ebuild b/sys-kernel/installkernel/installkernel-41.ebuild
new file mode 100644
index 000000000000..db93b183f69a
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-41.ebuild
@@ -0,0 +1,209 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-25 12:16 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-25 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 66d2529a645b513df2556cec247ee8898ce7961a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 11:52:56 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 12:16:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d2529a
sys-kernel/installkernel: add 40
This release extends USE=-systemd's logic to update a static version-less file
or symlink to USE=+systemd. And fixes installing refind icons for .old entries
and version-less entries.
Effectively it becomes possible to "static" efistub boot, complementing the
existing support for "dynamic" efistub booting (via virt-firmware and
uefi-mkconfig). It does require a manual step in the form of creating this
version-less file/symlink, subsequent re-installs will then update the file/
symlink (this mirrors how this was already implemented for USE=-systemd).
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-40.ebuild | 209 +++++++++++++++++++++++
2 files changed, 210 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 410f392a2829..1a278273bf14 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1 +1,2 @@
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
+DIST installkernel-40.tar.gz 22667 BLAKE2B cc3dd370428fa2e2b585feb9743db16bfa6f81bc869de366ea280837b865cff847cc12344db476650a79cca48ab839949c8f9d699ea0cdf68d27c7ccd009357a SHA512 a1302b63ec1a4cd3cc16f8ee5bbd7c209075964bea0963a355bbfd8513898f3c33ddc0150f43bcd0007166e93a72569ba55c75b8234db004a3d52b410714a4c1
diff --git a/sys-kernel/installkernel/installkernel-40.ebuild b/sys-kernel/installkernel/installkernel-40.ebuild
new file mode 100644
index 000000000000..db93b183f69a
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-40.ebuild
@@ -0,0 +1,209 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
+REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( dracut ugrd )
+"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ ugrd? ( sys-kernel/ugrd )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/90-zz-update-static.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-15 19:18 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-15 19:18 UTC (permalink / raw
To: gentoo-commits
commit: fcb9ecdc3dc77da03db79fa74fa458c4e5808c16
Author: Zen <z <AT> pyl <DOT> onl>
AuthorDate: Thu Jul 4 18:05:38 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 19:15:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb9ecdc
sys-kernel/installkernel: Add UGRD USE functions to installkernel-39.
Signed-off-by: Zen <z <AT> pyl.onl>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{installkernel-39-r1.ebuild => installkernel-39-r2.ebuild} | 6 +++++-
sys-kernel/installkernel/metadata.xml | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/installkernel/installkernel-39-r1.ebuild b/sys-kernel/installkernel/installkernel-39-r2.ebuild
similarity index 96%
rename from sys-kernel/installkernel/installkernel-39-r1.ebuild
rename to sys-kernel/installkernel/installkernel-39-r2.ebuild
index 719dc80ce7be..2b11a30d57c5 100644
--- a/sys-kernel/installkernel/installkernel-39-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-39-r2.ebuild
@@ -17,12 +17,13 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify"
REQUIRED_USE="
?? ( efistub grub systemd-boot )
refind? ( !systemd-boot !grub )
systemd-boot? ( systemd )
ukify? ( uki )
+ ?? ( dracut ugrd )
"
# Only select one flag that sets "layout=", except for uki since grub,
# systemd-boot, and efistub booting are all compatible with UKIs and
@@ -77,6 +78,7 @@ RDEPEND="
sys-apps/systemd-utils[boot(-),ukify(-)]
)
)
+ ugrd? ( sys-kernel/ugrd )
!=sys-apps/systemd-255.2-r1
!=sys-apps/systemd-255.2-r0
!~sys-apps/systemd-255.1
@@ -141,6 +143,8 @@ src_install() {
echo "uki_generator=none" >> "${T}/install.conf" || die
fi
fi
+ elif use ugrd; then
+ echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
else
echo "initrd_generator=none" >> "${T}/install.conf" || die
fi
diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index ba5cbd9d6764..70634cd58829 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -6,12 +6,13 @@
<name>Distribution Kernel Project</name>
</maintainer>
<use>
- <flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
+ <flag name="dracut">Generate an initramfs or UKI on each kernel installation</flag>
<flag name="efistub">EXPERIMENTAL: Update UEFI configuration on each kernel installation</flag>
<flag name="grub">Re-generate grub.cfg on each kernel installation, used grub.cfg is overridable with GRUB_CFG env var</flag>
<flag name="refind">Install a Gentoo icon for rEFInd alongside the (unified) kernel image, used icon is overridable with REFIND_ICON env var</flag>
<flag name="systemd">Use systemd's kernel-install to install kernels, overridable with SYSTEMD_KERNEL_INSTALL env var</flag>
<flag name="systemd-boot">Use systemd-boot's native layout by default</flag>
+ <flag name="ugrd">Generate an initramfs using UGRD on each kernel installation</flag>
<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs</flag>
<flag name="ukify">Build an UKI with systemd's ukify on each kernel installation</flag>
</use>
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-03 12:13 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-03 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 91036bb7dd4030e9ef83799531a79b96affa7cb4
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 11:41:30 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 12:13:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91036bb7
sys-kernel/installkernel: stabilize 39 for ALLARCHES
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-39.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-39.ebuild b/sys-kernel/installkernel/installkernel-39.ebuild
index 293828ee0c57..60f6910aa12c 100644
--- a/sys-kernel/installkernel/installkernel-39.ebuild
+++ b/sys-kernel/installkernel/installkernel-39.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
REQUIRED_USE="
systemd-boot? ( systemd )
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-03 12:13 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-03 12:13 UTC (permalink / raw
To: gentoo-commits
commit: d5a3fa1a5b04e14ee5802d9caa011ccb254267be
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 12:13:03 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 12:13:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a3fa1a
sys-kernel/installkernel: drop 38
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-38.ebuild | 186 -----------------------
2 files changed, 187 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6dbe36012b99..410f392a2829 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1 @@
-DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
diff --git a/sys-kernel/installkernel/installkernel-38.ebuild b/sys-kernel/installkernel/installkernel-38.ebuild
deleted file mode 100644
index 60f6910aa12c..000000000000
--- a/sys-kernel/installkernel/installkernel-38.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-07-03 12:13 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-07-03 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 903ac60bcc2ff0c22358946c81cd4d6b5534e8fc
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 12:10:43 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 12:13:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903ac60b
sys-kernel/installkernel: do not block enabling both refind and efistub
and document here why the REQUIRED_USE is the way it is.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...llkernel-39.ebuild => installkernel-39-r1.ebuild} | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-39.ebuild b/sys-kernel/installkernel/installkernel-39-r1.ebuild
similarity index 86%
rename from sys-kernel/installkernel/installkernel-39.ebuild
rename to sys-kernel/installkernel/installkernel-39-r1.ebuild
index 60f6910aa12c..719dc80ce7be 100644
--- a/sys-kernel/installkernel/installkernel-39.ebuild
+++ b/sys-kernel/installkernel/installkernel-39-r1.ebuild
@@ -19,10 +19,28 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
REQUIRED_USE="
+ ?? ( efistub grub systemd-boot )
+ refind? ( !systemd-boot !grub )
systemd-boot? ( systemd )
ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
"
+# Only select one flag that sets "layout=", except for uki since grub,
+# systemd-boot, and efistub booting are all compatible with UKIs and
+# the uki layout.
+#
+# Refind does not set a layout=, it is compatible with the compat, uki
+# and efistub layout. So block against only grub and systemd-boot.
+#
+# systemd-boot could be made to work without the systemd flag, but this
+# makes no sense since in systemd(-utils) the boot flag already
+# requires the kernel-install flag.
+#
+# Ukify hooks do nothing if the layout is not uki, so force this here.
+#
+# Only one initramfs generator flag can be selected. Note that while
+# both dracut and ukify are UKI generators we don't block those because
+# enabling both results in building an initramfs only with dracut and
+# building an UKI with ukify, which is a valid configuration.
RDEPEND="
!<=sys-kernel/installkernel-systemd-3
^ permalink raw reply related [flat|nested] 78+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-06-07 12:48 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-06-07 12:48 UTC (permalink / raw
To: gentoo-commits
commit: b41d92b4dc05b1afba16da848b8b5f23a2529752
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 12:47:12 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 12:47:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41d92b4
sys-kernel/installkernel: stabilize 38 for ALLARCHES
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-38.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-38.ebuild b/sys-kernel/installkernel/installkernel-38.ebuild
index 293828ee0c57..60f6910aa12c 100644
--- a/sys-kernel/installkernel/installkernel-38.ebuild
+++ b/sys-kernel/installkernel/installkernel-38.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
REQUIRED_USE="
systemd-boot? ( systemd )
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-06-07 12:48 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-06-07 12:48 UTC (permalink / raw
To: gentoo-commits
commit: fedfc617a6f7efc0fe928a106ab6046d2158a56e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 12:47:30 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 12:47:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fedfc617
sys-kernel/installkernel: drop 28
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-28.ebuild | 166 -----------------------
2 files changed, 167 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index f6676005f117..6dbe36012b99 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
-DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39
DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
diff --git a/sys-kernel/installkernel/installkernel-28.ebuild b/sys-kernel/installkernel/installkernel-28.ebuild
deleted file mode 100644
index 3e1edca83f72..000000000000
--- a/sys-kernel/installkernel/installkernel-28.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( grub refind systemd-boot )
-"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r1
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-06-03 17:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-06-03 17:59 UTC (permalink / raw
To: gentoo-commits
commit: f8b62c8d44fbbb8be2a739033f014dee995ed6d1
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 17:57:25 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 17:58:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b62c8d
sys-kernel/installkernel: add 39
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-39.ebuild | 186 +++++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index f13e8fe98269..f6676005f117 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39
+DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
diff --git a/sys-kernel/installkernel/installkernel-39.ebuild b/sys-kernel/installkernel/installkernel-39.ebuild
new file mode 100644
index 000000000000..293828ee0c57
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-39.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-05-07 15:57 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-05-07 15:57 UTC (permalink / raw
To: gentoo-commits
commit: ab42a37642512010b76d24767513eea0d968db76
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 15:55:44 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue May 7 15:55:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab42a376
sys-kernel/installkernel: drop 37
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-37.ebuild | 186 -----------------------
2 files changed, 187 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index dbd65c847232..f13e8fe98269 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-37.tar.gz 21040 BLAKE2B a6a94dd07c345d0606a557ad11d25f0089331afaced1a7c3c877c3fafbbb091e98d6655a2fb4460495feff064297d296aceb94e202a942f20eafe5e572c9bd81 SHA512 f689eb23791cc2aadcd4202b85af0e4b36a747b1c9f75d7e4a1d4fe0f64b92ae39a1d3f3b409fd8efeb52966c63010d7f6e827f5a9c45e2b39f57101e3c281f7
DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39
diff --git a/sys-kernel/installkernel/installkernel-37.ebuild b/sys-kernel/installkernel/installkernel-37.ebuild
deleted file mode 100644
index 293828ee0c57..000000000000
--- a/sys-kernel/installkernel/installkernel-37.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-05-07 15:57 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-05-07 15:57 UTC (permalink / raw
To: gentoo-commits
commit: bb4f42751ff3a6d315c16e8cb8b80f67ffb3ea1c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 15:55:04 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue May 7 15:55:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4f4275
sys-kernel/installkernel: add 38
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-38.ebuild | 186 +++++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 097709aa69ba..dbd65c847232 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-37.tar.gz 21040 BLAKE2B a6a94dd07c345d0606a557ad11d25f0089331afaced1a7c3c877c3fafbbb091e98d6655a2fb4460495feff064297d296aceb94e202a942f20eafe5e572c9bd81 SHA512 f689eb23791cc2aadcd4202b85af0e4b36a747b1c9f75d7e4a1d4fe0f64b92ae39a1d3f3b409fd8efeb52966c63010d7f6e827f5a9c45e2b39f57101e3c281f7
+DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39
diff --git a/sys-kernel/installkernel/installkernel-38.ebuild b/sys-kernel/installkernel/installkernel-38.ebuild
new file mode 100644
index 000000000000..293828ee0c57
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-38.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-24 10:13 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-24 10:13 UTC (permalink / raw
To: gentoo-commits
commit: ee1ae3a1f668aa970b099294b8643c315b934ca9
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 10:12:50 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 10:12:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1ae3a1
sys-kernel/installkernel: drop 36
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-36.ebuild | 190 -----------------------
2 files changed, 191 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 5cb7aa0df3ad..097709aa69ba 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-36.tar.gz 21122 BLAKE2B 1db6aaa8c46c6e374cfd0895f692562f3a4417e667bff61ded42c6ac01355867a932e87e71c354c555e121cc892200c4306fcc231b92f34d68476d24a99dbd23 SHA512 7a05513372d7441df5e97c275254dd3cf445001e791533993902290d2698a53b05a30540f637c851e774f0cf215c10f93e5ec3c5e55b36dd1415ed36eb7b5290
DIST installkernel-37.tar.gz 21040 BLAKE2B a6a94dd07c345d0606a557ad11d25f0089331afaced1a7c3c877c3fafbbb091e98d6655a2fb4460495feff064297d296aceb94e202a942f20eafe5e572c9bd81 SHA512 f689eb23791cc2aadcd4202b85af0e4b36a747b1c9f75d7e4a1d4fe0f64b92ae39a1d3f3b409fd8efeb52966c63010d7f6e827f5a9c45e2b39f57101e3c281f7
diff --git a/sys-kernel/installkernel/installkernel-36.ebuild b/sys-kernel/installkernel/installkernel-36.ebuild
deleted file mode 100644
index bae0d8720c6e..000000000000
--- a/sys-kernel/installkernel/installkernel-36.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-24 10:13 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-24 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 046ddd4ce83e70d09b39a2124e9ffb20ece0dd50
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 10:11:41 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 10:12:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=046ddd4c
sys-kernel/installkernel: add 37
Closes: https://bugs.gentoo.org/930520
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-37.ebuild | 186 +++++++++++++++++++++++
2 files changed, 187 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index c227ae844e5e..5cb7aa0df3ad 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-36.tar.gz 21122 BLAKE2B 1db6aaa8c46c6e374cfd0895f692562f3a4417e667bff61ded42c6ac01355867a932e87e71c354c555e121cc892200c4306fcc231b92f34d68476d24a99dbd23 SHA512 7a05513372d7441df5e97c275254dd3cf445001e791533993902290d2698a53b05a30540f637c851e774f0cf215c10f93e5ec3c5e55b36dd1415ed36eb7b5290
+DIST installkernel-37.tar.gz 21040 BLAKE2B a6a94dd07c345d0606a557ad11d25f0089331afaced1a7c3c877c3fafbbb091e98d6655a2fb4460495feff064297d296aceb94e202a942f20eafe5e572c9bd81 SHA512 f689eb23791cc2aadcd4202b85af0e4b36a747b1c9f75d7e4a1d4fe0f64b92ae39a1d3f3b409fd8efeb52966c63010d7f6e827f5a9c45e2b39f57101e3c281f7
diff --git a/sys-kernel/installkernel/installkernel-37.ebuild b/sys-kernel/installkernel/installkernel-37.ebuild
new file mode 100644
index 000000000000..293828ee0c57
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-37.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-13 15:19 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-13 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 732a36cbc6a5784c538646023fab3d0203879a57
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 15:15:48 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 15:19:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732a36cb
sys-kernel/installkernel: add 36
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-36.ebuild | 190 +++++++++++++++++++++++
2 files changed, 191 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 1c53db861f8b..1fef04fc382e 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-34.tar.gz 20816 BLAKE2B b6ed5ed823b949d2d64eeadc9d725e5b19593f2bf691b9878673eb18998b14b0fc71d9dd6a71461e911aefb376600b911dd354671c0503c683a630f011b451ac SHA512 1165113a0e1f942b9bf333f97432fa43ce72460f7081b34160cfbee283274a4756f1d81fa27448e156b90f8b6fa4506bebdc4224f7bc28568a357b67ce33fa21
DIST installkernel-35.tar.gz 21084 BLAKE2B b8138904302baafa32725c0f21f505cbe5ecd6381586c55cbb10a728be797eda3c718419c24542cd5c802d3fecc7208219b766fba6057ba66dce2ce1e59ae80b SHA512 532f754c554cf872cb8940d320d22e38160675e4197845d5855282fc71c77af7abf8ee6c755008529f4e1da475dca2d0b40192fb721f90a970f783063f15106b
+DIST installkernel-36.tar.gz 21122 BLAKE2B 1db6aaa8c46c6e374cfd0895f692562f3a4417e667bff61ded42c6ac01355867a932e87e71c354c555e121cc892200c4306fcc231b92f34d68476d24a99dbd23 SHA512 7a05513372d7441df5e97c275254dd3cf445001e791533993902290d2698a53b05a30540f637c851e774f0cf215c10f93e5ec3c5e55b36dd1415ed36eb7b5290
diff --git a/sys-kernel/installkernel/installkernel-36.ebuild b/sys-kernel/installkernel/installkernel-36.ebuild
new file mode 100644
index 000000000000..bae0d8720c6e
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-36.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-13 15:19 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-13 15:19 UTC (permalink / raw
To: gentoo-commits
commit: aa1b3b29eae1a6b3ef4d98eee04011b1715b4f9f
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 15:15:59 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 15:19:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1b3b29
sys-kernel/installkernel: drop 34-r1, 35
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 2 -
.../installkernel/installkernel-34-r1.ebuild | 190 ---------------------
sys-kernel/installkernel/installkernel-35.ebuild | 190 ---------------------
3 files changed, 382 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 1fef04fc382e..c227ae844e5e 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,2 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-34.tar.gz 20816 BLAKE2B b6ed5ed823b949d2d64eeadc9d725e5b19593f2bf691b9878673eb18998b14b0fc71d9dd6a71461e911aefb376600b911dd354671c0503c683a630f011b451ac SHA512 1165113a0e1f942b9bf333f97432fa43ce72460f7081b34160cfbee283274a4756f1d81fa27448e156b90f8b6fa4506bebdc4224f7bc28568a357b67ce33fa21
-DIST installkernel-35.tar.gz 21084 BLAKE2B b8138904302baafa32725c0f21f505cbe5ecd6381586c55cbb10a728be797eda3c718419c24542cd5c802d3fecc7208219b766fba6057ba66dce2ce1e59ae80b SHA512 532f754c554cf872cb8940d320d22e38160675e4197845d5855282fc71c77af7abf8ee6c755008529f4e1da475dca2d0b40192fb721f90a970f783063f15106b
DIST installkernel-36.tar.gz 21122 BLAKE2B 1db6aaa8c46c6e374cfd0895f692562f3a4417e667bff61ded42c6ac01355867a932e87e71c354c555e121cc892200c4306fcc231b92f34d68476d24a99dbd23 SHA512 7a05513372d7441df5e97c275254dd3cf445001e791533993902290d2698a53b05a30540f637c851e774f0cf215c10f93e5ec3c5e55b36dd1415ed36eb7b5290
diff --git a/sys-kernel/installkernel/installkernel-34-r1.ebuild b/sys-kernel/installkernel/installkernel-34-r1.ebuild
deleted file mode 100644
index bae0d8720c6e..000000000000
--- a/sys-kernel/installkernel/installkernel-34-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
diff --git a/sys-kernel/installkernel/installkernel-35.ebuild b/sys-kernel/installkernel/installkernel-35.ebuild
deleted file mode 100644
index bae0d8720c6e..000000000000
--- a/sys-kernel/installkernel/installkernel-35.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( sys-boot/uefi-mkconfig )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-12 10:39 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-12 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 9d9855067ca13bd52a85a922a9ce2fe3f099b872
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 10:38:33 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 10:39:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d985506
sys-kernel/installkernel: add 35
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-35.ebuild | 190 +++++++++++++++++++++++
2 files changed, 191 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 73a7877884cd..1c53db861f8b 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-34.tar.gz 20816 BLAKE2B b6ed5ed823b949d2d64eeadc9d725e5b19593f2bf691b9878673eb18998b14b0fc71d9dd6a71461e911aefb376600b911dd354671c0503c683a630f011b451ac SHA512 1165113a0e1f942b9bf333f97432fa43ce72460f7081b34160cfbee283274a4756f1d81fa27448e156b90f8b6fa4506bebdc4224f7bc28568a357b67ce33fa21
+DIST installkernel-35.tar.gz 21084 BLAKE2B b8138904302baafa32725c0f21f505cbe5ecd6381586c55cbb10a728be797eda3c718419c24542cd5c802d3fecc7208219b766fba6057ba66dce2ce1e59ae80b SHA512 532f754c554cf872cb8940d320d22e38160675e4197845d5855282fc71c77af7abf8ee6c755008529f4e1da475dca2d0b40192fb721f90a970f783063f15106b
diff --git a/sys-kernel/installkernel/installkernel-35.ebuild b/sys-kernel/installkernel/installkernel-35.ebuild
new file mode 100644
index 000000000000..bae0d8720c6e
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-35.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( sys-boot/uefi-mkconfig )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-09 16:16 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-09 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 224c910ae77d3665e8f84f99a50870f17b570c36
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 16:13:42 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 16:13:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224c910a
sys-kernel/installkernel: drop arch condition for uefi-mkconfig dep
uefi-mkconfig has been keyworded on the missing arches
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{installkernel-34.ebuild => installkernel-34-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-34.ebuild b/sys-kernel/installkernel/installkernel-34-r1.ebuild
similarity index 99%
rename from sys-kernel/installkernel/installkernel-34.ebuild
rename to sys-kernel/installkernel/installkernel-34-r1.ebuild
index 418eedfc222a..bae0d8720c6e 100644
--- a/sys-kernel/installkernel/installkernel-34.ebuild
+++ b/sys-kernel/installkernel/installkernel-34-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
)
efistub? (
systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
- !systemd? ( amd64? ( sys-boot/uefi-mkconfig ) )
+ !systemd? ( sys-boot/uefi-mkconfig )
)
grub? ( sys-boot/grub )
refind? ( sys-boot/refind )
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-09 9:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-09 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 19be0b408ee2c891745c9a51a744133288454c9c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 09:59:05 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 09:59:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19be0b40
sys-kernel/installkernel: drop 33
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-33.ebuild | 194 -----------------------
2 files changed, 195 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index a8b09fb21709..73a7877884cd 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
DIST installkernel-34.tar.gz 20816 BLAKE2B b6ed5ed823b949d2d64eeadc9d725e5b19593f2bf691b9878673eb18998b14b0fc71d9dd6a71461e911aefb376600b911dd354671c0503c683a630f011b451ac SHA512 1165113a0e1f942b9bf333f97432fa43ce72460f7081b34160cfbee283274a4756f1d81fa27448e156b90f8b6fa4506bebdc4224f7bc28568a357b67ce33fa21
diff --git a/sys-kernel/installkernel/installkernel-33.ebuild b/sys-kernel/installkernel/installkernel-33.ebuild
deleted file mode 100644
index f6c3c526454e..000000000000
--- a/sys-kernel/installkernel/installkernel-33.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- systemd? (
- >=app-emulation/virt-firmware-24.2_p20240315-r2
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-04-09 9:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-04-09 9:59 UTC (permalink / raw
To: gentoo-commits
commit: c7ec8c6ed7fbbb1586012b90ae6f15747482b1d5
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 09:57:15 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 09:57:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ec8c6e
sys-kernel/installkernel: add 34
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-34.ebuild | 190 +++++++++++++++++++++++
2 files changed, 191 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 890c31bf5410..a8b09fb21709 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
+DIST installkernel-34.tar.gz 20816 BLAKE2B b6ed5ed823b949d2d64eeadc9d725e5b19593f2bf691b9878673eb18998b14b0fc71d9dd6a71461e911aefb376600b911dd354671c0503c683a630f011b451ac SHA512 1165113a0e1f942b9bf333f97432fa43ce72460f7081b34160cfbee283274a4756f1d81fa27448e156b90f8b6fa4506bebdc4224f7bc28568a357b67ce33fa21
diff --git a/sys-kernel/installkernel/installkernel-34.ebuild b/sys-kernel/installkernel/installkernel-34.ebuild
new file mode 100644
index 000000000000..418eedfc222a
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-34.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
+ !systemd? ( amd64? ( sys-boot/uefi-mkconfig ) )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use efistub && doexe hooks/95-efistub-uefi-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-22 21:40 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-22 21:40 UTC (permalink / raw
To: gentoo-commits
commit: 470f5a276135cdd41b6f37a49d67cfe6a88ca749
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 21:37:58 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 21:37:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470f5a27
sys-kernel/installkernel: drop 25
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-25.ebuild | 154 -----------------------
2 files changed, 155 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 721440804d36..890c31bf5410 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
-DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
diff --git a/sys-kernel/installkernel/installkernel-25.ebuild b/sys-kernel/installkernel/installkernel-25.ebuild
deleted file mode 100644
index bfc4c5c975ff..000000000000
--- a/sys-kernel/installkernel/installkernel-25.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="systemd-boot? ( systemd )"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? ( >=sys-kernel/dracut-060_pre20240104-r1 )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-22 21:40 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-22 21:40 UTC (permalink / raw
To: gentoo-commits
commit: 9308c4edc32fb9836d0ccea800a68ded4cdb72c7
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 21:37:43 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 21:37:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9308c4ed
sys-kernel/installkernel: stabilize 28 for ALLARCHES
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-28.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-28.ebuild b/sys-kernel/installkernel/installkernel-28.ebuild
index a251bcbb30d4..3e1edca83f72 100644
--- a/sys-kernel/installkernel/installkernel-28.ebuild
+++ b/sys-kernel/installkernel/installkernel-28.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut grub refind systemd systemd-boot uki ukify"
REQUIRED_USE="
systemd-boot? ( systemd )
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-20 18:30 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-20 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 7a8c5261809b48ffb61ee7acab6d2e8eed787d7b
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 18:27:50 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 18:29:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8c5261
sys-kernel/installkernel: drop 30
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-30.ebuild | 194 -----------------------
2 files changed, 195 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 8c04c7e21491..721440804d36 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,3 @@
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-30.tar.gz 20945 BLAKE2B 1363545c06f368c8efed4f0fb026a68fbe1d34019573ca9bdd3eaaa2b2c83232c0b23c41351f8bef287d47a3c07aa20ce8900d5b452213d30c412617d33ef114 SHA512 2e506c018c255f23a81ca5bfb7e82c2ebf6a949be67d7876ac63b29773b630543225d1fc4a07f074f43b7e866381c654eb9a85ff3d8e2ced5d2c05c9a6afd412
DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
diff --git a/sys-kernel/installkernel/installkernel-30.ebuild b/sys-kernel/installkernel/installkernel-30.ebuild
deleted file mode 100644
index 9ba8f5cf4c74..000000000000
--- a/sys-kernel/installkernel/installkernel-30.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- efistub? ( systemd )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- >=app-emulation/virt-firmware-24.2_p20240315-r2
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub && ! has_version "${CATEGORY}/${PN}[efistub]"; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-20 18:30 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-20 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 4c5a5d4a0c6a5ff074a39d5101e797ae69912b4d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 18:27:35 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 18:29:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5a5d4a
sys-kernel/installkernel: add 33
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-33.ebuild | 194 +++++++++++++++++++++++
2 files changed, 195 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 0a3d1eebe798..8c04c7e21491 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-30.tar.gz 20945 BLAKE2B 1363545c06f368c8efed4f0fb026a68fbe1d34019573ca9bdd3eaaa2b2c83232c0b23c41351f8bef287d47a3c07aa20ce8900d5b452213d30c412617d33ef114 SHA512 2e506c018c255f23a81ca5bfb7e82c2ebf6a949be67d7876ac63b29773b630543225d1fc4a07f074f43b7e866381c654eb9a85ff3d8e2ced5d2c05c9a6afd412
+DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
diff --git a/sys-kernel/installkernel/installkernel-33.ebuild b/sys-kernel/installkernel/installkernel-33.ebuild
new file mode 100644
index 000000000000..f6c3c526454e
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-33.ebuild
@@ -0,0 +1,194 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ systemd? (
+ >=app-emulation/virt-firmware-24.2_p20240315-r2
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-19 15:47 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-19 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 24b1c5585afee5fa31a8a4d6f7e1b36d6fed5cf3
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 15:45:07 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 15:47:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b1c558
sys-kernel/installkernel: drop 29
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-29.ebuild | 194 -----------------------
2 files changed, 195 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 69f0c011e34d..0a3d1eebe798 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,3 @@
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-29.tar.gz 20796 BLAKE2B 280cc9b3f0906b9fe874411e5911c26c303d53bfa37530c9c3da4d1ab99507014ce240e386db6676e422e646ea3f51cd08fa1ded2b899933de7076085aaa9ab4 SHA512 c72ad5a187edf24eb49924576cb553fcef797e797373d8a0f6f5e599155c35a8418463ba8138479d016f555e9e683146be681f959197533951169cf2aea6be95
DIST installkernel-30.tar.gz 20945 BLAKE2B 1363545c06f368c8efed4f0fb026a68fbe1d34019573ca9bdd3eaaa2b2c83232c0b23c41351f8bef287d47a3c07aa20ce8900d5b452213d30c412617d33ef114 SHA512 2e506c018c255f23a81ca5bfb7e82c2ebf6a949be67d7876ac63b29773b630543225d1fc4a07f074f43b7e866381c654eb9a85ff3d8e2ced5d2c05c9a6afd412
diff --git a/sys-kernel/installkernel/installkernel-29.ebuild b/sys-kernel/installkernel/installkernel-29.ebuild
deleted file mode 100644
index 9ba8f5cf4c74..000000000000
--- a/sys-kernel/installkernel/installkernel-29.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- efistub? ( systemd )
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r4
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- efistub? (
- >=app-emulation/virt-firmware-24.2_p20240315-r2
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-pkg_setup() {
- use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use efistub; then
- echo "layout=efistub" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-
- if use efistub && ! has_version "${CATEGORY}/${PN}[efistub]"; then
- ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
- ewarn "often differ between vendors and as a result EFI stub booting is not"
- ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
- ewarn "of booting the system is available before rebooting."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-19 15:47 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-19 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 77653056bbe36997e2a6a53820af01f1a82fcea7
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 15:44:19 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 15:47:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77653056
sys-kernel/installkernel: add 30
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-30.ebuild | 194 +++++++++++++++++++++++
2 files changed, 195 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 7c37de71cbd5..69f0c011e34d 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
DIST installkernel-29.tar.gz 20796 BLAKE2B 280cc9b3f0906b9fe874411e5911c26c303d53bfa37530c9c3da4d1ab99507014ce240e386db6676e422e646ea3f51cd08fa1ded2b899933de7076085aaa9ab4 SHA512 c72ad5a187edf24eb49924576cb553fcef797e797373d8a0f6f5e599155c35a8418463ba8138479d016f555e9e683146be681f959197533951169cf2aea6be95
+DIST installkernel-30.tar.gz 20945 BLAKE2B 1363545c06f368c8efed4f0fb026a68fbe1d34019573ca9bdd3eaaa2b2c83232c0b23c41351f8bef287d47a3c07aa20ce8900d5b452213d30c412617d33ef114 SHA512 2e506c018c255f23a81ca5bfb7e82c2ebf6a949be67d7876ac63b29773b630543225d1fc4a07f074f43b7e866381c654eb9a85ff3d8e2ced5d2c05c9a6afd412
diff --git a/sys-kernel/installkernel/installkernel-30.ebuild b/sys-kernel/installkernel/installkernel-30.ebuild
new file mode 100644
index 000000000000..9ba8f5cf4c74
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-30.ebuild
@@ -0,0 +1,194 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ efistub? ( systemd )
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( efistub grub refind systemd-boot )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r4
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ efistub? (
+ >=app-emulation/virt-firmware-24.2_p20240315-r2
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+pkg_setup() {
+ use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use efistub; then
+ echo "layout=efistub" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+
+ if use efistub && ! has_version "${CATEGORY}/${PN}[efistub]"; then
+ ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+ ewarn "often differ between vendors and as a result EFI stub booting is not"
+ ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+ ewarn "of booting the system is available before rebooting."
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-08 16:06 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-08 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 86a2737ccd1f8a6c5868bea3964ae6835e7bdde9
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 16:06:17 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 16:06:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a2737c
sys-kernel/installkernel: stabilize 25 for ALLARCHES
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-25.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-25.ebuild b/sys-kernel/installkernel/installkernel-25.ebuild
index 42913a8d7459..bfc4c5c975ff 100644
--- a/sys-kernel/installkernel/installkernel-25.ebuild
+++ b/sys-kernel/installkernel/installkernel-25.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut grub refind systemd systemd-boot uki ukify"
REQUIRED_USE="systemd-boot? ( systemd )"
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-03-08 16:06 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-03-08 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 8b9cfe42679d89bb537c7fafa5f3d8a4c9d97a7c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 16:06:34 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 16:06:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9cfe42
sys-kernel/installkernel: drop 24
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-24.ebuild | 151 -----------------------
2 files changed, 152 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index cfe4e0abbc98..835db019e6be 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
-DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
diff --git a/sys-kernel/installkernel/installkernel-24.ebuild b/sys-kernel/installkernel/installkernel-24.ebuild
deleted file mode 100644
index 130cca70e57c..000000000000
--- a/sys-kernel/installkernel/installkernel-24.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub systemd systemd-boot uki ukify"
-REQUIRED_USE="systemd-boot? ( systemd )"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? ( >=sys-kernel/dracut-060_pre20240104-r1 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-24 6:28 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-24 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 670c0998daf4ee97d11e323f1c5fc776fa98c071
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 06:27:30 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 06:28:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670c0998
sys-kernel/installkernel: drop 12
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-12.ebuild | 60 ------------------------
2 files changed, 61 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index d697d3323340..cfe4e0abbc98 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,3 @@
-DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
diff --git a/sys-kernel/installkernel/installkernel-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild
deleted file mode 100644
index 5b470acfed5f..000000000000
--- a/sys-kernel/installkernel/installkernel-12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub uki ukify"
-
-RDEPEND="
- >=sys-apps/debianutils-4.9-r1
- !<sys-apps/debianutils-4.9-r1[installkernel(+)]
- !sys-kernel/installkernel-systemd
-"
-
-src_install() {
- into /
- dosbin installkernel
- doman installkernel.8
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- if use dracut; then
- exeinto /etc/kernel/preinst.d
- doexe hooks/50-dracut.install
- fi
-
- if use grub; then
- exeinto /etc/kernel/postinst.d
- doexe hooks/91-grub-mkconfig.install
- fi
-
- if use uki; then
- exeinto /etc/kernel/postinst.d
- doexe hooks/90-uki-copy.install
- fi
-
- if use ukify; then
- exeinto /etc/kernel/preinst.d
- doexe hooks/60-ukify.install
- fi
-}
-
-pkg_postinst() {
- if has 1 ${REPLACING_VERSIONS}; then
- ewarn "In v2, the initramfs filename has changed to initramfs*.img, to match"
- ewarn "the default names used by dracut and genkernel-4. If your bootloader"
- ewarn "config uses the verbatim filename, please update it."
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-24 2:44 Ionen Wolkens
0 siblings, 0 replies; 78+ messages in thread
From: Ionen Wolkens @ 2024-02-24 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 3e57336f6b3759322396f7c0ebdc6d74cb01404a
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Fri Feb 23 15:44:37 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 02:30:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e57336f
sys-kernel/installkernel: Stabilize 24 arm, #922811
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
sys-kernel/installkernel/installkernel-24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-24.ebuild b/sys-kernel/installkernel/installkernel-24.ebuild
index e825c472c126..130cca70e57c 100644
--- a/sys-kernel/installkernel/installkernel-24.ebuild
+++ b/sys-kernel/installkernel/installkernel-24.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut grub systemd systemd-boot uki ukify"
REQUIRED_USE="systemd-boot? ( systemd )"
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-23 14:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-23 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 33410ac58e108fcf61e0212fb4a78b614de6f5b9
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 14:58:27 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 14:59:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33410ac5
sys-kernel/installkernel: add 28
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-28.ebuild | 166 +++++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 3b3b13269270..70d88f12460e 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -3,3 +3,4 @@ DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8ad
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-26.tar.gz 18632 BLAKE2B 35fafbfcdb6eb2b6d2f75f2beb03839f4ed6838f7643d01aebb8e09eaf07f2349eaa290c68ca0852658e026fdc597c33ee443e7acc44f27f386da8709145d16d SHA512 ec96c4780ef5352b544b590cc6fdce5fb396bcf7c2d738c2c93dd19f20ea7003c4944340cb03ebdb9ac679c9ac81601d9739ef26ccd7b07ed7684a44f100aa75
DIST installkernel-27.tar.gz 18917 BLAKE2B 822e88e4d3b6d81c26a331f852eafdee372105c8f58a3a3a6800cbcde1032c97acebe063492fb5323368a61db7302a7afae328bf121451822f035fd23e4a5453 SHA512 51d8bfb38570bc64d1b65c63eaf4c43babdfb4fb351ae9b84b417c10308e4fb65bac269c5fcfa48f843ba048830b5da5e87a95f9c9163c83d6fb58e24abb80b6
+DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
diff --git a/sys-kernel/installkernel/installkernel-28.ebuild b/sys-kernel/installkernel/installkernel-28.ebuild
new file mode 100644
index 000000000000..a251bcbb30d4
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-28.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( grub refind systemd-boot )
+"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r1
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-23 14:59 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-23 14:59 UTC (permalink / raw
To: gentoo-commits
commit: cbb3a138745a3263655a56146132a8902de60b60
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 14:59:11 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 14:59:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb3a138
sys-kernel/installkernel: drop 26, 27
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 2 -
sys-kernel/installkernel/installkernel-26.ebuild | 162 ----------------------
sys-kernel/installkernel/installkernel-27.ebuild | 166 -----------------------
3 files changed, 330 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 70d88f12460e..d697d3323340 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,6 +1,4 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
-DIST installkernel-26.tar.gz 18632 BLAKE2B 35fafbfcdb6eb2b6d2f75f2beb03839f4ed6838f7643d01aebb8e09eaf07f2349eaa290c68ca0852658e026fdc597c33ee443e7acc44f27f386da8709145d16d SHA512 ec96c4780ef5352b544b590cc6fdce5fb396bcf7c2d738c2c93dd19f20ea7003c4944340cb03ebdb9ac679c9ac81601d9739ef26ccd7b07ed7684a44f100aa75
-DIST installkernel-27.tar.gz 18917 BLAKE2B 822e88e4d3b6d81c26a331f852eafdee372105c8f58a3a3a6800cbcde1032c97acebe063492fb5323368a61db7302a7afae328bf121451822f035fd23e4a5453 SHA512 51d8bfb38570bc64d1b65c63eaf4c43babdfb4fb351ae9b84b417c10308e4fb65bac269c5fcfa48f843ba048830b5da5e87a95f9c9163c83d6fb58e24abb80b6
DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
diff --git a/sys-kernel/installkernel/installkernel-26.ebuild b/sys-kernel/installkernel/installkernel-26.ebuild
deleted file mode 100644
index e42ed6004810..000000000000
--- a/sys-kernel/installkernel/installkernel-26.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="systemd-boot? ( systemd )"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r1
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-}
diff --git a/sys-kernel/installkernel/installkernel-27.ebuild b/sys-kernel/installkernel/installkernel-27.ebuild
deleted file mode 100644
index a251bcbb30d4..000000000000
--- a/sys-kernel/installkernel/installkernel-27.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
- systemd-boot? ( systemd )
- ukify? ( uki )
- ?? ( grub refind systemd-boot )
-"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? (
- >=sys-kernel/dracut-060_pre20240104-r1
- uki? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- )
- grub? ( sys-boot/grub )
- refind? ( sys-boot/refind )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[boot(-),ukify(-)]
- sys-apps/systemd-utils[boot(-),ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /usr/lib/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /usr/lib/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
- use refind && doexe hooks/95-refind-copy-icon.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
- use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${T}/install.conf" || die
- fi
-
- if use dracut; then
- echo "initrd_generator=dracut" >> "${T}/install.conf" || die
- if ! use ukify; then
- if use uki; then
- echo "uki_generator=dracut" >> "${T}/install.conf" || die
- else
- echo "uki_generator=none" >> "${T}/install.conf" || die
- fi
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-23 13:02 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-23 13:02 UTC (permalink / raw
To: gentoo-commits
commit: d21803ed142cc74f249714da766722ac0be9a76e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 13:00:37 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 13:02:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21803ed
sys-kernel/installkernel: add 27
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-27.ebuild | 166 +++++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 98c7637afdfb..3b3b13269270 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -2,3 +2,4 @@ DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd
DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
DIST installkernel-26.tar.gz 18632 BLAKE2B 35fafbfcdb6eb2b6d2f75f2beb03839f4ed6838f7643d01aebb8e09eaf07f2349eaa290c68ca0852658e026fdc597c33ee443e7acc44f27f386da8709145d16d SHA512 ec96c4780ef5352b544b590cc6fdce5fb396bcf7c2d738c2c93dd19f20ea7003c4944340cb03ebdb9ac679c9ac81601d9739ef26ccd7b07ed7684a44f100aa75
+DIST installkernel-27.tar.gz 18917 BLAKE2B 822e88e4d3b6d81c26a331f852eafdee372105c8f58a3a3a6800cbcde1032c97acebe063492fb5323368a61db7302a7afae328bf121451822f035fd23e4a5453 SHA512 51d8bfb38570bc64d1b65c63eaf4c43babdfb4fb351ae9b84b417c10308e4fb65bac269c5fcfa48f843ba048830b5da5e87a95f9c9163c83d6fb58e24abb80b6
diff --git a/sys-kernel/installkernel/installkernel-27.ebuild b/sys-kernel/installkernel/installkernel-27.ebuild
new file mode 100644
index 000000000000..a251bcbb30d4
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-27.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+ systemd-boot? ( systemd )
+ ukify? ( uki )
+ ?? ( grub refind systemd-boot )
+"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r1
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-22 13:08 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-22 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 98a8afa16a76ac319a85b4e700d236659b486f22
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 13:05:18 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:08:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a8afa1
sys-kernel/installkernel: add 26
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-26.ebuild | 162 +++++++++++++++++++++++
2 files changed, 163 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index bc0bbc284b54..98c7637afdfb 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
+DIST installkernel-26.tar.gz 18632 BLAKE2B 35fafbfcdb6eb2b6d2f75f2beb03839f4ed6838f7643d01aebb8e09eaf07f2349eaa290c68ca0852658e026fdc597c33ee443e7acc44f27f386da8709145d16d SHA512 ec96c4780ef5352b544b590cc6fdce5fb396bcf7c2d738c2c93dd19f20ea7003c4944340cb03ebdb9ac679c9ac81601d9739ef26ccd7b07ed7684a44f100aa75
diff --git a/sys-kernel/installkernel/installkernel-26.ebuild b/sys-kernel/installkernel/installkernel-26.ebuild
new file mode 100644
index 000000000000..e42ed6004810
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-26.ebuild
@@ -0,0 +1,162 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? (
+ >=sys-kernel/dracut-060_pre20240104-r1
+ uki? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[boot(-),ukify(-)]
+ sys-apps/systemd-utils[boot(-),ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /usr/lib/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /usr/lib/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-09 12:51 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-09 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 1d01bdd9d2b54ac216f3dd0cdfb380b9c2dec67d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 12:44:45 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 12:50:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d01bdd9
sys-kernel/installkernel: add 25
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-25.ebuild | 154 +++++++++++++++++++++++
sys-kernel/installkernel/metadata.xml | 5 +-
3 files changed, 158 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index b558e182bd6e..bc0bbc284b54 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
+DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
diff --git a/sys-kernel/installkernel/installkernel-25.ebuild b/sys-kernel/installkernel/installkernel-25.ebuild
new file mode 100644
index 000000000000..42913a8d7459
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-25.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? ( >=sys-kernel/dracut-060_pre20240104-r1 )
+ grub? ( sys-boot/grub )
+ refind? ( sys-boot/refind )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+ use refind && doexe hooks/95-refind-copy-icon.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+ use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+}
diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 6fffd1cc0b32..e99bb67ffdb8 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -7,8 +7,9 @@
</maintainer>
<use>
<flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
- <flag name="grub">Re-generate grub.cfg on each kernel installation</flag>
- <flag name="systemd">Use systemd's kernel-install to install kernels</flag>
+ <flag name="grub">Re-generate grub.cfg on each kernel installation, used grub.cfg is overridable with GRUB_CFG env var</flag>
+ <flag name="refind">Install a Gentoo icon for rEFInd alongside the (unified) kernel image, used icon is overridable with REFIND_ICON env var</flag>
+ <flag name="systemd">Use systemd's kernel-install to install kernels, overridable with SYSTEMD_KERNEL_INSTALL env var</flag>
<flag name="systemd-boot">Use systemd-boot's native layout by default</flag>
<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs</flag>
<flag name="ukify">Build an UKI with systemd's ukify on each kernel installation</flag>
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-02 13:11 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 9bd4f529f2f7861f323f2727a1b496987f5cdb14
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 13:09:58 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 13:11:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd4f529
sys-kernel/installkernel: drop 23
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-23.ebuild | 147 -----------------------
2 files changed, 148 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index aa20fd145628..b558e182bd6e 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963
DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
diff --git a/sys-kernel/installkernel/installkernel-23.ebuild b/sys-kernel/installkernel/installkernel-23.ebuild
deleted file mode 100644
index 333ea4b45568..000000000000
--- a/sys-kernel/installkernel/installkernel-23.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub systemd systemd-boot uki ukify"
-REQUIRED_USE="systemd-boot? ( systemd )"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- dracut? ( >=sys-kernel/dracut-060_pre20240104 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- systemd-boot? (
- || (
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- doexe hooks/systemd/90-compat.install
- doexe hooks/systemd/91-grub-mkconfig.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use systemd-boot; then
- echo "layout=bls" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- else
- echo "layout=compat" >> "${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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- # show only when upgrading to 14+
- if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
- elog
- fi
-
- # show only on first install of version 20+
- if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
- if has_version "sys-boot/grub" && ! use grub; then
- elog "sys-boot/grub is installed but the grub USE flag is not enabled."
- elog "Users may want to enable this flag to automatically update the"
- elog "bootloader configuration on each kernel install."
- fi
- if ( has_version "sys-apps/systemd[boot]" ||
- has_version "sys-apps/systemd-utils[boot]" ) &&
- ! use systemd-boot; then
- elog "systemd-boot is installed but the systemd-boot USE flag"
- elog "is not enabled. Users should enable this flag to install kernels"
- elog "in a layout that systemd-boot understands and to automatically"
- elog "update systemd-boot's configuration on each kernel install."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-02 13:11 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 357b8ab8dd80132444015ed099b7dca1af731362
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 13:07:12 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 13:11:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357b8ab8
sys-kernel/installkernel: add 24
this version makes it possible to use UKIs in the grub layout and
updating the grub configuration when using the uki layout
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-24.ebuild | 151 +++++++++++++++++++++++
2 files changed, 152 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index a71fbe0fe7f1..aa20fd145628 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963
+DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
diff --git a/sys-kernel/installkernel/installkernel-24.ebuild b/sys-kernel/installkernel/installkernel-24.ebuild
new file mode 100644
index 000000000000..e825c472c126
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-24.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+IUSE="dracut grub systemd systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? ( >=sys-kernel/dracut-060_pre20240104-r1 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${T}/install.conf" || die
+ fi
+
+ if use dracut; then
+ echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+ if ! use ukify; then
+ if use uki; then
+ echo "uki_generator=dracut" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-02 6:28 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 3b0704586288958c44056d2da3fd9be9c3d733ea
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 12:46:51 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 06:15:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b070458
sys-kernel/installkernel: add 23
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-23.ebuild | 147 +++++++++++++++++++++++
sys-kernel/installkernel/metadata.xml | 3 +-
3 files changed, 150 insertions(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6da69eaadfb6..33cec081f9f9 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0
+DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963
diff --git a/sys-kernel/installkernel/installkernel-23.ebuild b/sys-kernel/installkernel/installkernel-23.ebuild
new file mode 100644
index 000000000000..333ea4b45568
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-23.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+IUSE="dracut grub systemd systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ systemd-boot? (
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ doexe hooks/systemd/90-compat.install
+ doexe hooks/systemd/91-grub-mkconfig.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use systemd-boot; then
+ echo "layout=bls" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ else
+ echo "layout=compat" >> "${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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ # show only when upgrading to 14+
+ if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+ elog
+ fi
+
+ # show only on first install of version 20+
+ if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+ if has_version "sys-boot/grub" && ! use grub; then
+ elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+ elog "Users may want to enable this flag to automatically update the"
+ elog "bootloader configuration on each kernel install."
+ fi
+ if ( has_version "sys-apps/systemd[boot]" ||
+ has_version "sys-apps/systemd-utils[boot]" ) &&
+ ! use systemd-boot; then
+ elog "systemd-boot is installed but the systemd-boot USE flag"
+ elog "is not enabled. Users should enable this flag to install kernels"
+ elog "in a layout that systemd-boot understands and to automatically"
+ elog "update systemd-boot's configuration on each kernel install."
+ fi
+ fi
+}
diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 65393ba6a433..6fffd1cc0b32 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -8,7 +8,8 @@
<use>
<flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
<flag name="grub">Re-generate grub.cfg on each kernel installation</flag>
- <flag name="systemd">Use systemd's kernel-install to install kernels'</flag>
+ <flag name="systemd">Use systemd's kernel-install to install kernels</flag>
+ <flag name="systemd-boot">Use systemd-boot's native layout by default</flag>
<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs</flag>
<flag name="ukify">Build an UKI with systemd's ukify on each kernel installation</flag>
</use>
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-02-02 6:28 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 60ff5a2bc473691cceda11de2fec46a0a155a3b4
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 12:47:26 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 06:16:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ff5a2b
sys-kernel/installkernel: drop 19
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-19.ebuild | 117 -----------------------
2 files changed, 118 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 33cec081f9f9..a71fbe0fe7f1 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0
DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963
diff --git a/sys-kernel/installkernel/installkernel-19.ebuild b/sys-kernel/installkernel/installkernel-19.ebuild
deleted file mode 100644
index abbc9f75bb73..000000000000
--- a/sys-kernel/installkernel/installkernel-19.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub systemd uki ukify"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- >=sys-apps/debianutils-4.9-r1
- dracut? ( >=sys-kernel/dracut-060_pre20240104 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-
- einstalldocs
-}
-
-pkg_postinst() {
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-29 8:48 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-29 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 833a37f1917ee124d6bdbb644e262098a8769321
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 08:42:08 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 08:42:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833a37f1
sys-kernel/installkernel: drop 18-r1
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
.../installkernel/installkernel-18-r1.ebuild | 115 ---------------------
2 files changed, 116 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 4d1f4b247633..6da69eaadfb6 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0
diff --git a/sys-kernel/installkernel/installkernel-18-r1.ebuild b/sys-kernel/installkernel/installkernel-18-r1.ebuild
deleted file mode 100644
index 3b9e7deb08d9..000000000000
--- a/sys-kernel/installkernel/installkernel-18-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
- https://github.com/projg2/installkernel-gentoo
- https://wiki.gentoo.org/wiki/Installkernel
-"
-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"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub systemd uki ukify"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- >=sys-apps/debianutils-4.9-r1
- dracut? ( >=sys-kernel/dracut-060_pre20240104 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-}
-
-pkg_postinst() {
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-29 8:48 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-29 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 5772f824048870d525bb80f7a7040d3c11fca8ad
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 08:41:58 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 08:41:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5772f824
sys-kernel/installkernel: add 19
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-19.ebuild | 117 +++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index e95b127d9900..4d1f4b247633 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
+DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0
diff --git a/sys-kernel/installkernel/installkernel-19.ebuild b/sys-kernel/installkernel/installkernel-19.ebuild
new file mode 100644
index 000000000000..abbc9f75bb73
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-19.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
+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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+IUSE="dracut grub systemd uki ukify"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ >=sys-apps/debianutils-4.9-r1
+ dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-27 21:08 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-27 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 75455f3df748cb46221dcc8beadc241b4534e0fe
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 21:07:23 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 21:07:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75455f3d
sys-kernel/installkernel: drop USE=module-rebuild
Closes: https://bugs.gentoo.org/923025
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{installkernel-18.ebuild => installkernel-18-r1.ebuild} | 4 +---
sys-kernel/installkernel/metadata.xml | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18-r1.ebuild
similarity index 93%
rename from sys-kernel/installkernel/installkernel-18.ebuild
rename to sys-kernel/installkernel/installkernel-18-r1.ebuild
index fdd2a5b43c17..3b9e7deb08d9 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub module-rebuild systemd uki ukify"
+IUSE="dracut grub systemd uki ukify"
RDEPEND="
!<=sys-kernel/installkernel-systemd-3
@@ -49,7 +49,6 @@ src_install() {
keepdir /etc/kernel/preinst.d
exeinto /etc/kernel/preinst.d
- use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
use dracut && doexe hooks/50-dracut.install
use ukify && doexe hooks/60-ukify.install
@@ -60,7 +59,6 @@ src_install() {
exeinto /usr/lib/kernel/install.d
doexe hooks/systemd/00-00machineid-directory.install
doexe hooks/systemd/10-copy-prebuilt.install
- use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
use grub && doexe hooks/systemd/91-grub-mkconfig.install
if use systemd; then
diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 22804e2901e3..65393ba6a433 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
<flag name="grub">Re-generate grub.cfg on each kernel installation</flag>
- <flag name="module-rebuild">Rebuild external kernel modules before generating the initramfs</flag>
<flag name="systemd">Use systemd's kernel-install to install kernels'</flag>
<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs</flag>
<flag name="ukify">Build an UKI with systemd's ukify on each kernel installation</flag>
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-25 12:03 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-25 12:03 UTC (permalink / raw
To: gentoo-commits
commit: ad92f751b3b0fb69c827a7a46b4d30c2a52191f7
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 12:03:25 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 12:03:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad92f751
sys-kernel/installkernel: update HOMEPAGE
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-12.ebuild | 5 ++++-
sys-kernel/installkernel/installkernel-18.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/installkernel/installkernel-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild
index cd4bb88b1d78..5b470acfed5f 100644
--- a/sys-kernel/installkernel/installkernel-12.ebuild
+++ b/sys-kernel/installkernel/installkernel-12.ebuild
@@ -4,7 +4,10 @@
EAPI=8
DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="https://github.com/projg2/installkernel-gentoo"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
S="${WORKDIR}/${PN}-gentoo-${PV}"
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index e47c848aa133..fdd2a5b43c17 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -4,7 +4,10 @@
EAPI=8
DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="https://github.com/projg2/installkernel-gentoo"
+HOMEPAGE="
+ https://github.com/projg2/installkernel-gentoo
+ https://wiki.gentoo.org/wiki/Installkernel
+"
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
S="${WORKDIR}/${PN}-gentoo-${PV}"
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-25 1:37 Sam James
0 siblings, 0 replies; 78+ messages in thread
From: Sam James @ 2024-01-25 1:37 UTC (permalink / raw
To: gentoo-commits
commit: fd167060763672e6f4e8ad85cd063888e25ce762
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 01:37:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 01:37:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd167060
sys-kernel/installkernel: Stabilize 18 hppa, #922811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 211c4e124e5a..e47c848aa133 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 14:44 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-24 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 1cc761d02ffd4ed737edbb67562eb37b6f4845be
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 14:43:51 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 14:43:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc761d0
sys-kernel/installkernel: drop 15-r1, 17
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 2 -
.../installkernel/installkernel-15-r1.ebuild | 122 ---------------------
sys-kernel/installkernel/installkernel-17.ebuild | 114 -------------------
3 files changed, 238 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 03bed8876c0c..e95b127d9900 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,2 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
-DIST installkernel-17.tar.gz 7109 BLAKE2B 1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216 SHA512 f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03
DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
diff --git a/sys-kernel/installkernel/installkernel-15-r1.ebuild b/sys-kernel/installkernel/installkernel-15-r1.ebuild
deleted file mode 100644
index a97420affeb8..000000000000
--- a/sys-kernel/installkernel/installkernel-15-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut grub systemd uki ukify"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- >=sys-apps/debianutils-4.9-r1
- dracut? ( >=sys-kernel/dracut-059-r4 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- if use dracut; then
- exeinto /etc/kernel/preinst.d
- doexe hooks/50-dracut.install
- fi
-
- if use grub; then
- exeinto /etc/kernel/postinst.d
- doexe hooks/91-grub-mkconfig.install
- fi
-
- if use uki; then
- exeinto /etc/kernel/postinst.d
- doexe hooks/90-uki-copy.install
- fi
-
- if use ukify; then
- exeinto /etc/kernel/preinst.d
- doexe hooks/60-ukify.install
- fi
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/*.install
-
- into /
- dosbin installkernel
- doman installkernel.8
-}
-
-pkg_postinst() {
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-}
diff --git a/sys-kernel/installkernel/installkernel-17.ebuild b/sys-kernel/installkernel/installkernel-17.ebuild
deleted file mode 100644
index 1bcf6f519ede..000000000000
--- a/sys-kernel/installkernel/installkernel-17.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="dracut grub module-rebuild systemd uki ukify"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- >=sys-apps/debianutils-4.9-r1
- dracut? ( >=sys-kernel/dracut-060_pre20240104 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-}
-
-pkg_postinst() {
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 14:39 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-24 14:39 UTC (permalink / raw
To: gentoo-commits
commit: dd777824a5523f812a7fd267ae474320be536411
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 14:38:26 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 14:38:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd777824
sys-kernel/installkernel: drop default +dracut
This is now possible due to the last-rites of
installkernel-systemd
Closes: https://bugs.gentoo.org/922772
Bug: https://bugs.gentoo.org/917145
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-12.ebuild | 2 +-
sys-kernel/installkernel/installkernel-15-r1.ebuild | 2 +-
sys-kernel/installkernel/installkernel-17.ebuild | 2 +-
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-kernel/installkernel/installkernel-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild
index 042e7cbdf2d6..cd4bb88b1d78 100644
--- a/sys-kernel/installkernel/installkernel-12.ebuild
+++ b/sys-kernel/installkernel/installkernel-12.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+dracut grub uki ukify"
+IUSE="dracut grub uki ukify"
RDEPEND="
>=sys-apps/debianutils-4.9-r1
diff --git a/sys-kernel/installkernel/installkernel-15-r1.ebuild b/sys-kernel/installkernel/installkernel-15-r1.ebuild
index 44838afc89c4..a97420affeb8 100644
--- a/sys-kernel/installkernel/installkernel-15-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-15-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+dracut grub systemd uki ukify"
+IUSE="dracut grub systemd uki ukify"
RDEPEND="
!<=sys-kernel/installkernel-systemd-3
diff --git a/sys-kernel/installkernel/installkernel-17.ebuild b/sys-kernel/installkernel/installkernel-17.ebuild
index 0f0f4cb9259d..1bcf6f519ede 100644
--- a/sys-kernel/installkernel/installkernel-17.ebuild
+++ b/sys-kernel/installkernel/installkernel-17.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+dracut grub module-rebuild systemd uki ukify"
+IUSE="dracut grub module-rebuild systemd uki ukify"
RDEPEND="
!<=sys-kernel/installkernel-systemd-3
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 034dd32a9060..211c4e124e5a 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+dracut grub module-rebuild systemd uki ukify"
+IUSE="dracut grub module-rebuild systemd uki ukify"
RDEPEND="
!<=sys-kernel/installkernel-systemd-3
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 14:35 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-24 14:35 UTC (permalink / raw
To: gentoo-commits
commit: a326529793058c98a21111765edda1f527038782
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 14:15:53 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 14:15:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3265297
sys-kernel/installkernel: stabilize 18 for amd64
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index cedb0adff3ff..034dd32a9060 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 13:37 Sam James
0 siblings, 0 replies; 78+ messages in thread
From: Sam James @ 2024-01-24 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 8e6173faeb0f2d0f5e4cfc4d6fe99e7e2ae5702c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 13:37:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 13:37:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6173fa
sys-kernel/installkernel: Stabilize 18 x86, #922811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 289379898fca..cedb0adff3ff 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 10:59 Sam James
0 siblings, 0 replies; 78+ messages in thread
From: Sam James @ 2024-01-24 10:59 UTC (permalink / raw
To: gentoo-commits
commit: 2f9f0857d07d0c56747a38124f58a3551a37e8ee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:58:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 10:58:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9f0857
sys-kernel/installkernel: Stabilize 18 ppc64, #922811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index d677663e3304..289379898fca 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
IUSE="+dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 10:58 Sam James
0 siblings, 0 replies; 78+ messages in thread
From: Sam James @ 2024-01-24 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 6ed01743f753e268478927ecfcba0ae3ea88982b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:58:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 10:58:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed01743
sys-kernel/installkernel: Stabilize 18 arm64, #922811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 0f0f4cb9259d..19e921897ef2 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="+dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 10:58 Sam James
0 siblings, 0 replies; 78+ messages in thread
From: Sam James @ 2024-01-24 10:58 UTC (permalink / raw
To: gentoo-commits
commit: dd6a20464ef9a0877f8a7ea87eb8ff18ea5f381e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:58:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 10:58:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6a2046
sys-kernel/installkernel: Stabilize 18 sparc, #922811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 19e921897ef2..6297f91bfd23 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
IUSE="+dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-24 10:58 Sam James
0 siblings, 0 replies; 78+ messages in thread
From: Sam James @ 2024-01-24 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 57b50ca3ff8873d066fef01ffbb9163ec56753d1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:58:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 10:58:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b50ca3
sys-kernel/installkernel: Stabilize 18 ppc, #922811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/installkernel/installkernel-18.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 6297f91bfd23..d677663e3304 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
IUSE="+dracut grub module-rebuild systemd uki ukify"
RDEPEND="
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-19 21:33 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-19 21:33 UTC (permalink / raw
To: gentoo-commits
commit: bbd5f92e1c606a1f29923b47b203ff3121db3ee1
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 21:32:49 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 21:33:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd5f92e
sys-kernel/installkernel: add 18
this version allows skipping of -systemd initrd/uki plugins
at runtime
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-18.ebuild | 114 +++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 1e354b8e2f95..03bed8876c0c 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
DIST installkernel-17.tar.gz 7109 BLAKE2B 1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216 SHA512 f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03
+DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
new file mode 100644
index 000000000000..0f0f4cb9259d
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+dracut grub module-rebuild systemd uki ukify"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ >=sys-apps/debianutils-4.9-r1
+ dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+}
+
+pkg_postinst() {
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-19 10:57 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-19 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 91941778110d7aa5181f1ca2af17bfa25b7c645b
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 10:56:56 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 10:57:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91941778
sys-kernel/installkernel: drop 16
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
sys-kernel/installkernel/installkernel-16.ebuild | 114 -----------------------
2 files changed, 115 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 8c7e4cb07a09..1e354b8e2f95 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
-DIST installkernel-16.tar.gz 6773 BLAKE2B c54682159d60b7de7283ad6dda209155b7a6338f524164d8a6aee13e12d724678a027a57dd27a7023e78ed1ed263aa0ced60e5349afb3b319339b4396805c655 SHA512 f751ecd164ba955c89660ca46b632325bb8cf2364204629ca87c9d89a08a55d1f8b920261d5ea5a2ef93a25d206ad097f98812a2c6a89060ccd6d127a8ec1515
DIST installkernel-17.tar.gz 7109 BLAKE2B 1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216 SHA512 f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03
diff --git a/sys-kernel/installkernel/installkernel-16.ebuild b/sys-kernel/installkernel/installkernel-16.ebuild
deleted file mode 100644
index 0f0f4cb9259d..000000000000
--- a/sys-kernel/installkernel/installkernel-16.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+dracut grub module-rebuild systemd uki ukify"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- >=sys-apps/debianutils-4.9-r1
- dracut? ( >=sys-kernel/dracut-060_pre20240104 )
- grub? ( sys-boot/grub )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
- !=sys-apps/systemd-255.2-r1
- !=sys-apps/systemd-255.2-r0
- !~sys-apps/systemd-255.1
- !~sys-apps/systemd-255.0
- !=sys-apps/systemd-254.8-r0
- !=sys-apps/systemd-254.7-r0
- !~sys-apps/systemd-254.6
- !<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- exeinto /etc/kernel/preinst.d
- use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
- use dracut && doexe hooks/50-dracut.install
- use ukify && doexe hooks/60-ukify.install
-
- exeinto /etc/kernel/postinst.d
- use uki && doexe hooks/90-uki-copy.install
- use grub && doexe hooks/91-grub-mkconfig.install
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/00-00machineid-directory.install
- doexe hooks/systemd/10-copy-prebuilt.install
- use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
- use grub && doexe hooks/systemd/91-grub-mkconfig.install
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- 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
-
- insinto /usr/lib/kernel
- doins "${T}/install.conf"
-
- into /
- dosbin installkernel
- doman installkernel.8
-}
-
-pkg_postinst() {
- elog "Version 14 and up of ${PN} effectively merges"
- elog "${PN}-gentoo and ${PN}-systemd."
- elog "Switching between the traditional installkernel and systemd's"
- elog "kernel-install is controlled with the systemd USE flag or the"
- elog "SYSTEMD_KERNEL_INSTALL environment variable."
- elog
- elog "See the installkernel wiki page[1] for more details."
- elog
- elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-19 10:57 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-19 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 536a22a56713c5384b22f9056aff676638a9040d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 10:56:43 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 10:57:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536a22a5
sys-kernel/installkernel: add 17
Closes: https://bugs.gentoo.org/922446
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-17.ebuild | 114 +++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 387ffae2c134..8c7e4cb07a09 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
DIST installkernel-16.tar.gz 6773 BLAKE2B c54682159d60b7de7283ad6dda209155b7a6338f524164d8a6aee13e12d724678a027a57dd27a7023e78ed1ed263aa0ced60e5349afb3b319339b4396805c655 SHA512 f751ecd164ba955c89660ca46b632325bb8cf2364204629ca87c9d89a08a55d1f8b920261d5ea5a2ef93a25d206ad097f98812a2c6a89060ccd6d127a8ec1515
+DIST installkernel-17.tar.gz 7109 BLAKE2B 1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216 SHA512 f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03
diff --git a/sys-kernel/installkernel/installkernel-17.ebuild b/sys-kernel/installkernel/installkernel-17.ebuild
new file mode 100644
index 000000000000..0f0f4cb9259d
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-17.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+dracut grub module-rebuild systemd uki ukify"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ >=sys-apps/debianutils-4.9-r1
+ dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+}
+
+pkg_postinst() {
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-18 10:22 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-18 10:22 UTC (permalink / raw
To: gentoo-commits
commit: fa36fdb83abcb29412402ed7a2e88554d426c9fe
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 10:20:57 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 10:21:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa36fdb8
sys-kernel/installkernel: add 16
- bump minimal dracut version for the latest fix for layout=grub
- do not install grub kernel-install hook if not use grub
- add plugin for rebuilding external kernel modules before generating initramfs
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-16.ebuild | 114 +++++++++++++++++++++++
sys-kernel/installkernel/metadata.xml | 1 +
3 files changed, 116 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6eb6ad079b94..387ffae2c134 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
+DIST installkernel-16.tar.gz 6773 BLAKE2B c54682159d60b7de7283ad6dda209155b7a6338f524164d8a6aee13e12d724678a027a57dd27a7023e78ed1ed263aa0ced60e5349afb3b319339b4396805c655 SHA512 f751ecd164ba955c89660ca46b632325bb8cf2364204629ca87c9d89a08a55d1f8b920261d5ea5a2ef93a25d206ad097f98812a2c6a89060ccd6d127a8ec1515
diff --git a/sys-kernel/installkernel/installkernel-16.ebuild b/sys-kernel/installkernel/installkernel-16.ebuild
new file mode 100644
index 000000000000..0f0f4cb9259d
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-16.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+dracut grub module-rebuild systemd uki ukify"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ >=sys-apps/debianutils-4.9-r1
+ dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ exeinto /etc/kernel/preinst.d
+ use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
+ use dracut && doexe hooks/50-dracut.install
+ use ukify && doexe hooks/60-ukify.install
+
+ exeinto /etc/kernel/postinst.d
+ use uki && doexe hooks/90-uki-copy.install
+ use grub && doexe hooks/91-grub-mkconfig.install
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/00-00machineid-directory.install
+ doexe hooks/systemd/10-copy-prebuilt.install
+ use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
+ use grub && doexe hooks/systemd/91-grub-mkconfig.install
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ 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
+
+ insinto /usr/lib/kernel
+ doins "${T}/install.conf"
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+}
+
+pkg_postinst() {
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+}
diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 65393ba6a433..22804e2901e3 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
<flag name="grub">Re-generate grub.cfg on each kernel installation</flag>
+ <flag name="module-rebuild">Rebuild external kernel modules before generating the initramfs</flag>
<flag name="systemd">Use systemd's kernel-install to install kernels'</flag>
<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs</flag>
<flag name="ukify">Build an UKI with systemd's ukify on each kernel installation</flag>
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-17 20:52 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-17 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 26d726f5be02cecc0b61917f9150db587a1fa6b6
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 20:50:53 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 20:51:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d726f5
sys-kernel/installkernel: add more blockers
Closes: https://bugs.gentoo.org/922259
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-15-r1.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys-kernel/installkernel/installkernel-15-r1.ebuild b/sys-kernel/installkernel/installkernel-15-r1.ebuild
index a43ea8488b88..44838afc89c4 100644
--- a/sys-kernel/installkernel/installkernel-15-r1.ebuild
+++ b/sys-kernel/installkernel/installkernel-15-r1.ebuild
@@ -32,9 +32,13 @@ RDEPEND="
)
)
!=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-255.2-r0
+ !~sys-apps/systemd-255.1
+ !~sys-apps/systemd-255.0
!=sys-apps/systemd-254.8-r0
!=sys-apps/systemd-254.7-r0
- !=sys-apps/systemd-254.5-r1
+ !~sys-apps/systemd-254.6
+ !<=sys-apps/systemd-254.5-r1
" # Block against systemd that still installs dummy install.conf
src_install() {
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-13 14:56 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-13 14:56 UTC (permalink / raw
To: gentoo-commits
commit: a6b0608e5ed75a68dfb1d5d6a31daa59ad6287c2
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 13:50:06 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 14:54:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b0608e
sys-kernel/installkernel: move install.conf from etc to usr/lib
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34776
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../{installkernel-15.ebuild => installkernel-15-r1.ebuild} | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/sys-kernel/installkernel/installkernel-15.ebuild b/sys-kernel/installkernel/installkernel-15-r1.ebuild
similarity index 88%
rename from sys-kernel/installkernel/installkernel-15.ebuild
rename to sys-kernel/installkernel/installkernel-15-r1.ebuild
index 99a5eec37735..a43ea8488b88 100644
--- a/sys-kernel/installkernel/installkernel-15.ebuild
+++ b/sys-kernel/installkernel/installkernel-15-r1.ebuild
@@ -31,7 +31,11 @@ RDEPEND="
sys-apps/systemd-utils[ukify(-)]
)
)
-"
+ !=sys-apps/systemd-255.2-r1
+ !=sys-apps/systemd-254.8-r0
+ !=sys-apps/systemd-254.7-r0
+ !=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
src_install() {
keepdir /etc/kernel/postinst.d
@@ -64,6 +68,7 @@ src_install() {
# set some default config using the flags we have anyway
touch "${T}/install.conf" || die
+ echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
if use uki; then
echo "layout=uki" >> "${T}/install.conf" || die
elif use grub; then
@@ -89,7 +94,7 @@ src_install() {
fi
fi
- insinto /etc/kernel
+ insinto /usr/lib/kernel
doins "${T}/install.conf"
exeinto /usr/lib/kernel/install.d
@@ -109,5 +114,5 @@ pkg_postinst() {
elog
elog "See the installkernel wiki page[1] for more details."
elog
- elog "https://wiki.gentoo.org/wiki/Installkernel"
+ elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-13 7:45 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-13 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 1e4515d0384b8cd88cb4b049e9a4a247dcba2c66
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 07:44:57 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 07:44:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4515d0
sys-kernel/installkernel: drop 14-r2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 -
.../installkernel/installkernel-14-r2.ebuild | 102 ---------------------
2 files changed, 103 deletions(-)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index dd6aaa2ea683..6eb6ad079b94 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66
DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
diff --git a/sys-kernel/installkernel/installkernel-14-r2.ebuild b/sys-kernel/installkernel/installkernel-14-r2.ebuild
deleted file mode 100644
index d1e076fe9523..000000000000
--- a/sys-kernel/installkernel/installkernel-14-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+dracut grub systemd uki ukify"
-
-RDEPEND="
- !<=sys-kernel/installkernel-systemd-3
- >=sys-apps/debianutils-4.9-r1
- dracut? ( >=sys-kernel/dracut-059-r4 )
- systemd? (
- || (
- sys-apps/systemd[kernel-install(-)]
- sys-apps/systemd-utils[kernel-install(-)]
- )
- )
- ukify? (
- || (
- sys-apps/systemd[ukify(-)]
- sys-apps/systemd-utils[ukify(-)]
- )
- )
-"
-
-src_install() {
- keepdir /etc/kernel/postinst.d
- keepdir /etc/kernel/preinst.d
-
- if use dracut; then
- exeinto /etc/kernel/preinst.d
- doexe hooks/50-dracut.install
- fi
-
- if use grub; then
- exeinto /etc/kernel/postinst.d
- doexe hooks/91-grub-mkconfig.install
- fi
-
- if use uki; then
- exeinto /etc/kernel/postinst.d
- doexe hooks/90-uki-copy.install
- fi
-
- if use ukify; then
- exeinto /etc/kernel/preinst.d
- doexe hooks/60-ukify.install
- fi
-
- if use systemd; then
- sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
- die "enabling systemd's kernel-install failed"
- fi
-
- # set some default config using the flags we have anyway
- touch "${T}/install.conf" || die
- if use uki; then
- echo "layout=uki" >> "${T}/install.conf" || die
- elif use grub; then
- echo "layout=grub" >> "${T}/install.conf" || die
- 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
- insinto /etc/kernel
- doins "${T}/install.conf"
- fi
-
- exeinto /usr/lib/kernel/install.d
- doexe hooks/systemd/*.install
-
- into /
- dosbin installkernel
- doman installkernel.8
-}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-13 7:45 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-13 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 107adc53bf7ee8319dab6c2b6724556b68e2f0fd
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 07:43:23 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 07:43:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107adc53
sys-kernel/installkernel: add 15
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/Manifest | 1 +
sys-kernel/installkernel/installkernel-15.ebuild | 113 +++++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index fd2621827d37..dd6aaa2ea683 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
DIST installkernel-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66
+DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
diff --git a/sys-kernel/installkernel/installkernel-15.ebuild b/sys-kernel/installkernel/installkernel-15.ebuild
new file mode 100644
index 000000000000..99a5eec37735
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-15.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+dracut grub systemd uki ukify"
+
+RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
+ >=sys-apps/debianutils-4.9-r1
+ dracut? ( >=sys-kernel/dracut-059-r4 )
+ grub? ( sys-boot/grub )
+ systemd? (
+ || (
+ sys-apps/systemd[kernel-install(-)]
+ sys-apps/systemd-utils[kernel-install(-)]
+ )
+ )
+ ukify? (
+ || (
+ sys-apps/systemd[ukify(-)]
+ sys-apps/systemd-utils[ukify(-)]
+ )
+ )
+"
+
+src_install() {
+ keepdir /etc/kernel/postinst.d
+ keepdir /etc/kernel/preinst.d
+
+ if use dracut; then
+ exeinto /etc/kernel/preinst.d
+ doexe hooks/50-dracut.install
+ fi
+
+ if use grub; then
+ exeinto /etc/kernel/postinst.d
+ doexe hooks/91-grub-mkconfig.install
+ fi
+
+ if use uki; then
+ exeinto /etc/kernel/postinst.d
+ doexe hooks/90-uki-copy.install
+ fi
+
+ if use ukify; then
+ exeinto /etc/kernel/preinst.d
+ doexe hooks/60-ukify.install
+ fi
+
+ if use systemd; then
+ sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+ die "enabling systemd's kernel-install failed"
+ fi
+
+ # set some default config using the flags we have anyway
+ touch "${T}/install.conf" || die
+ if use uki; then
+ echo "layout=uki" >> "${T}/install.conf" || die
+ elif use grub; then
+ echo "layout=grub" >> "${T}/install.conf" || die
+ 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
+
+ insinto /etc/kernel
+ doins "${T}/install.conf"
+
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/systemd/*.install
+
+ into /
+ dosbin installkernel
+ doman installkernel.8
+}
+
+pkg_postinst() {
+ elog "Version 14 and up of ${PN} effectively merges"
+ elog "${PN}-gentoo and ${PN}-systemd."
+ elog "Switching between the traditional installkernel and systemd's"
+ elog "kernel-install is controlled with the systemd USE flag or the"
+ elog "SYSTEMD_KERNEL_INSTALL environment variable."
+ elog
+ elog "See the installkernel wiki page[1] for more details."
+ elog
+ elog "https://wiki.gentoo.org/wiki/Installkernel"
+}
^ permalink raw reply related [flat|nested] 78+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-13 6:49 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-13 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 838f6d984abf0d07a4a705643f1ce37690137772
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Sat Jan 13 03:53:11 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 06:49:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838f6d98
sys-kernel/installkernel: add blockers
Upgrade path should be to uninstall sys-kernel/installkernel-systemd
first and then install new sys-kernel/installkernel
Closes: https://bugs.gentoo.org/921975
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/34775
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/installkernel/installkernel-14-r2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-kernel/installkernel/installkernel-14-r2.ebuild b/sys-kernel/installkernel/installkernel-14-r2.ebuild
index 05307034f5e5..d1e076fe9523 100644
--- a/sys-kernel/installkernel/installkernel-14-r2.ebuild
+++ b/sys-kernel/installkernel/installkernel-14-r2.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
IUSE="+dracut grub systemd uki ukify"
RDEPEND="
+ !<=sys-kernel/installkernel-systemd-3
>=sys-apps/debianutils-4.9-r1
dracut? ( >=sys-kernel/dracut-059-r4 )
systemd? (
^ permalink raw reply related [flat|nested] 78+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
@ 2024-01-12 11:45 Andrew Ammerlaan
0 siblings, 0 replies; 78+ messages in thread
From: Andrew Ammerlaan @ 2024-01-12 11:45 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 78+ messages in thread
end of thread, other threads:[~2024-10-24 14:54 UTC | newest]
Thread overview: 78+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-03 7:37 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2024-10-24 14:54 Andrew Ammerlaan
2024-09-05 7:46 Andrew Ammerlaan
2024-09-05 7:46 Andrew Ammerlaan
2024-08-05 14:58 Andrew Ammerlaan
2024-08-05 14:28 Andrew Ammerlaan
2024-08-05 14:28 Andrew Ammerlaan
2024-08-03 15:59 Andrew Ammerlaan
2024-08-03 15:59 Andrew Ammerlaan
2024-08-03 9:21 Andrew Ammerlaan
2024-08-03 9:21 Andrew Ammerlaan
2024-08-03 7:37 Andrew Ammerlaan
2024-07-31 7:21 Andrew Ammerlaan
2024-07-31 7:21 Andrew Ammerlaan
2024-07-30 18:25 Andrew Ammerlaan
2024-07-30 18:24 Andrew Ammerlaan
2024-07-30 17:55 Andrew Ammerlaan
2024-07-26 20:36 Andrew Ammerlaan
2024-07-25 12:16 Andrew Ammerlaan
2024-07-15 19:18 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-06-07 12:48 Andrew Ammerlaan
2024-06-07 12:48 Andrew Ammerlaan
2024-06-03 17:59 Andrew Ammerlaan
2024-05-07 15:57 Andrew Ammerlaan
2024-05-07 15:57 Andrew Ammerlaan
2024-04-24 10:13 Andrew Ammerlaan
2024-04-24 10:13 Andrew Ammerlaan
2024-04-13 15:19 Andrew Ammerlaan
2024-04-13 15:19 Andrew Ammerlaan
2024-04-12 10:39 Andrew Ammerlaan
2024-04-09 16:16 Andrew Ammerlaan
2024-04-09 9:59 Andrew Ammerlaan
2024-04-09 9:59 Andrew Ammerlaan
2024-03-22 21:40 Andrew Ammerlaan
2024-03-22 21:40 Andrew Ammerlaan
2024-03-20 18:30 Andrew Ammerlaan
2024-03-20 18:30 Andrew Ammerlaan
2024-03-19 15:47 Andrew Ammerlaan
2024-03-19 15:47 Andrew Ammerlaan
2024-03-08 16:06 Andrew Ammerlaan
2024-03-08 16:06 Andrew Ammerlaan
2024-02-24 6:28 Andrew Ammerlaan
2024-02-24 2:44 Ionen Wolkens
2024-02-23 14:59 Andrew Ammerlaan
2024-02-23 14:59 Andrew Ammerlaan
2024-02-23 13:02 Andrew Ammerlaan
2024-02-22 13:08 Andrew Ammerlaan
2024-02-09 12:51 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-02-02 6:28 Andrew Ammerlaan
2024-02-02 6:28 Andrew Ammerlaan
2024-01-29 8:48 Andrew Ammerlaan
2024-01-29 8:48 Andrew Ammerlaan
2024-01-27 21:08 Andrew Ammerlaan
2024-01-25 12:03 Andrew Ammerlaan
2024-01-25 1:37 Sam James
2024-01-24 14:44 Andrew Ammerlaan
2024-01-24 14:39 Andrew Ammerlaan
2024-01-24 14:35 Andrew Ammerlaan
2024-01-24 13:37 Sam James
2024-01-24 10:59 Sam James
2024-01-24 10:58 Sam James
2024-01-24 10:58 Sam James
2024-01-24 10:58 Sam James
2024-01-19 21:33 Andrew Ammerlaan
2024-01-19 10:57 Andrew Ammerlaan
2024-01-19 10:57 Andrew Ammerlaan
2024-01-18 10:22 Andrew Ammerlaan
2024-01-17 20:52 Andrew Ammerlaan
2024-01-13 14:56 Andrew Ammerlaan
2024-01-13 7:45 Andrew Ammerlaan
2024-01-13 7:45 Andrew Ammerlaan
2024-01-13 6:49 Andrew Ammerlaan
2024-01-12 11:45 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox