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

2024-05-07 Thread Andrew Ammerlaan
commit: bb4f42751ff3a6d315c16e8cb8b80f67ffb3ea1c
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue May  7 15:55:04 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue May  7 15:55:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4f4275

sys-kernel/installkernel: add 38

Signed-off-by: Andrew Ammerlaan  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 ..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
+   

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

2024-05-07 Thread Andrew Ammerlaan
commit: ab42a37642512010b76d24767513eea0d968db76
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue May  7 15:55:44 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue May  7 15:55:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab42a376

sys-kernel/installkernel: drop 37

Signed-off-by: Andrew Ammerlaan  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..
--- 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
-  

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

2024-04-24 Thread Andrew Ammerlaan
commit: ee1ae3a1f668aa970b099294b8643c315b934ca9
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Apr 24 10:12:50 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Apr 24 10:12:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1ae3a1

sys-kernel/installkernel: drop 36

Signed-off-by: Andrew Ammerlaan  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..
--- 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
-  

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

2024-04-24 Thread Andrew Ammerlaan
commit: 046ddd4ce83e70d09b39a2124e9ffb20ece0dd50
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Apr 24 10:11:41 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Apr 24 10:12:10 2024 +
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  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 ..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 

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

2024-04-13 Thread Andrew Ammerlaan
commit: 732a36cbc6a5784c538646023fab3d0203879a57
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Apr 13 15:15:48 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Apr 13 15:19:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732a36cb

sys-kernel/installkernel: add 36

Signed-off-by: Andrew Ammerlaan  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 ..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
+
+   

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

2024-04-13 Thread Andrew Ammerlaan
commit: aa1b3b29eae1a6b3ef4d98eee04011b1715b4f9f
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Apr 13 15:15:59 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Apr 13 15:19:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1b3b29

sys-kernel/installkernel: drop 34-r1, 35

Signed-off-by: Andrew Ammerlaan  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..
--- 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
-}
-

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

2024-04-12 Thread Andrew Ammerlaan
commit: 9d9855067ca13bd52a85a922a9ce2fe3f099b872
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Apr 12 10:38:33 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Apr 12 10:39:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d985506

sys-kernel/installkernel: add 35

Signed-off-by: Andrew Ammerlaan  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 ..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
+  

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

2024-04-09 Thread Andrew Ammerlaan
commit: 224c910ae77d3665e8f84f99a50870f17b570c36
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Apr  9 16:13:42 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr  9 16:13:42 2024 +
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  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 )



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

2024-04-09 Thread Andrew Ammerlaan
commit: 19be0b408ee2c891745c9a51a744133288454c9c
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Apr  9 09:59:05 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr  9 09:59:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19be0b40

sys-kernel/installkernel: drop 33

Signed-off-by: Andrew Ammerlaan  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..
--- 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
-
-  

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

2024-04-09 Thread Andrew Ammerlaan
commit: c7ec8c6ed7fbbb1586012b90ae6f15747482b1d5
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Apr  9 09:57:15 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr  9 09:57:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ec8c6e

sys-kernel/installkernel: add 34

Signed-off-by: Andrew Ammerlaan  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 ..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 

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

2024-03-22 Thread Andrew Ammerlaan
commit: 9308c4edc32fb9836d0ccea800a68ded4cdb72c7
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar 22 21:37:43 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar 22 21:37:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9308c4ed

sys-kernel/installkernel: stabilize 28 for ALLARCHES

Signed-off-by: Andrew Ammerlaan  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 )



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

2024-03-22 Thread Andrew Ammerlaan
commit: 470f5a276135cdd41b6f37a49d67cfe6a88ca749
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar 22 21:37:58 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar 22 21:37:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470f5a27

sys-kernel/installkernel: drop 25

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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..
--- 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 

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

2024-03-20 Thread Andrew Ammerlaan
commit: 7a8c5261809b48ffb61ee7acab6d2e8eed787d7b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Mar 20 18:27:50 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Mar 20 18:29:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8c5261

sys-kernel/installkernel: drop 30

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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..
--- 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" 

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

2024-03-20 Thread Andrew Ammerlaan
commit: 4c5a5d4a0c6a5ff074a39d5101e797ae69912b4d
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Mar 20 18:27:35 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Mar 20 18:29:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5a5d4a

sys-kernel/installkernel: add 33

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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 ..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 

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

2024-03-19 Thread Andrew Ammerlaan
commit: 24b1c5585afee5fa31a8a4d6f7e1b36d6fed5cf3
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Mar 19 15:45:07 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Mar 19 15:47:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b1c558

sys-kernel/installkernel: drop 29

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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..
--- 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" 

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

2024-03-19 Thread Andrew Ammerlaan
commit: 77653056bbe36997e2a6a53820af01f1a82fcea7
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Mar 19 15:44:19 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Mar 19 15:47:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77653056

sys-kernel/installkernel: add 30

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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 ..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

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

2024-03-08 Thread Andrew Ammerlaan
commit: 8b9cfe42679d89bb537c7fafa5f3d8a4c9d97a7c
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar  8 16:06:34 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar  8 16:06:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9cfe42

sys-kernel/installkernel: drop 24

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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..
--- 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
- 

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

2024-03-08 Thread Andrew Ammerlaan
commit: 86a2737ccd1f8a6c5868bea3964ae6835e7bdde9
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar  8 16:06:17 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar  8 16:06:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a2737c

sys-kernel/installkernel: stabilize 25 for ALLARCHES

Signed-off-by: Andrew Ammerlaan  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 )"
 



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

2024-02-23 Thread Andrew Ammerlaan
commit: 670c0998daf4ee97d11e323f1c5fc776fa98c071
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Feb 24 06:27:30 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Feb 24 06:28:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670c0998

sys-kernel/installkernel: drop 12

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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..
--- 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
-   !

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd/files/, profiles/features/prefix/, ...

2024-02-23 Thread Andrew Ammerlaan
commit: 947415a47a2c8471d6af51b7982ac128512f0f1f
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Feb 24 05:58:36 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Feb 24 06:01:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947415a4

sys-kernel/installkernel-systemd: treeclean

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 profiles/features/prefix/package.mask  |  1 -
 profiles/package.mask  | 10 --
 ...l-systemd-2-r2-00-00machineid-directory.install | 32 ---
 ...nstallkernel-systemd-3-10-copy-prebuilt.install | 24 ---
 .../installkernel-systemd-3.ebuild | 36 --
 .../installkernel-systemd-4-r1.ebuild  | 23 --
 sys-kernel/installkernel-systemd/metadata.xml  |  9 --
 7 files changed, 135 deletions(-)

diff --git a/profiles/features/prefix/package.mask 
b/profiles/features/prefix/package.mask
index 3a54bbdc93cb..fb04d3abbc1c 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -13,6 +13,5 @@ gnome-extra/gnome-user-share
 gnome-extra/office-runner
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
-sys-kernel/installkernel-systemd
 sys-process/systemd-cron
 www-misc/profile-sync-daemon

diff --git a/profiles/package.mask b/profiles/package.mask
index 29ac74f60991..823faadc09ec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -184,16 +184,6 @@ mail-filter/libsrs_alt
 ~app-misc/ddcutil-2.1.0
 ~app-misc/ddcui-0.5.0
 
-# Andrew Ammerlaan  (2024-01-24)
-# The functionality of sys-kernel/installkernel-systemd has been
-# integrated into sys-kernel/installkernel[systemd].
-# Please install sys-kernel/installkernel and remove
-# sys-kernel/installkernel-systemd. See the news item entitled
-# "Merging of installkernel-gentoo and installkernel-systemd" for details.
-#
-# Removal on 2024-02-24
-sys-kernel/installkernel-systemd
-
 # Michał Górny  (2024-01-24)
 # Unmaintained, tests fail, requires discontinued dev-python/bsddb3.
 # No commits since 2022.  No reverse dependencies.

diff --git 
a/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
 
b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
deleted file mode 100644
index 54871f9e70eb..
--- 
a/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env sh
-
-# this file is installed by sys-kernel/installkernel-systemd
-
-COMMAND="${1}"
-ENTRY_DIR_ABS="${3}"
-
-# this is exported by kernel-install
-if [ -z "${KERNEL_INSTALL_MACHINE_ID}" ]; then
-   exit 0
-fi
-
-if [ "${KERNEL_INSTALL_LAYOUT}" = "uki" ]; then
-   exit 0
-fi
-
-if [ "${COMMAND}" != "add" ]; then
-   exit 0
-fi
-
-# If the machine-id dir does not exist (e.g. $ESP/)
-# create it. It receives values directly from kernel-install.
-# This is the only function of this plugin.
-MACHINE_ID_DIR="${ENTRY_DIR_ABS%/*}"
-if ! [ -d "${MACHINE_ID_DIR}" ]; then
-   if [ "${KERNEL_INSTALL_VERBOSE}" = "1" ]; then
-   echo "+mkdir -v -p ${MACHINE_ID_DIR}"
-   mkdir -v -p "${MACHINE_ID_DIR}"
-   else
-   mkdir -p "${MACHINE_ID_DIR}"
-   fi
-fi

diff --git 
a/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
 
b/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
deleted file mode 100644
index 56f4641d9664..
--- 
a/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env sh
-
-# this file is installed by sys-kernel/installkernel-systemd
-
-COMMAND="${1}"
-KERNEL_IMAGE="${4}"
-
-if [ "${COMMAND}" != "add" ]; then
-   exit 0
-fi
-
-IMAGE_DIR="$(dirname ${KERNEL_IMAGE})"
-INITRD=${IMAGE_DIR}/initrd
-UKI=${IMAGE_DIR}/uki.efi
-
-if [ -f "${INITRD}" ]; then
-   echo "Copying prebuilt initramfs to staging area"
-   cp "${INITRD}" "${KERNEL_INSTALL_STAGING_AREA}/initrd" || exit 1
-fi
-
-if [ -f "${UKI}" ]; then
-   echo "Copying prebuilt UKI to staging area"
-   cp "${UKI}" "${KERNEL_INSTALL_STAGING_AREA}/uki.efi" || exit 1
-fi

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
deleted file mode 100644
index eea709e13c17..
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Wrap kernel-install from systemd as installkernel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"

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

2024-02-23 Thread Ionen Wolkens
commit: 3e57336f6b3759322396f7c0ebdc6d74cb01404a
Author: Matoro Mahri  matoro  tk>
AuthorDate: Fri Feb 23 15:44:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 24 02:30:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e57336f

sys-kernel/installkernel: Stabilize 24 arm, #922811

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  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 )"
 



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

2024-02-23 Thread Andrew Ammerlaan
commit: 33410ac58e108fcf61e0212fb4a78b614de6f5b9
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb 23 14:58:27 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb 23 14:59:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33410ac5

sys-kernel/installkernel: add 28

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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 ..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 

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

2024-02-23 Thread Andrew Ammerlaan
commit: cbb3a138745a3263655a56146132a8902de60b60
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb 23 14:59:11 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb 23 14:59:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb3a138

sys-kernel/installkernel: drop 26, 27

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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..
--- 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 

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

2024-02-23 Thread Andrew Ammerlaan
commit: d21803ed142cc74f249714da766722ac0be9a76e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb 23 13:00:37 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb 23 13:02:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21803ed

sys-kernel/installkernel: add 27

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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 ..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 

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

2024-02-22 Thread Andrew Ammerlaan
commit: 98a8afa16a76ac319a85b4e700d236659b486f22
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Feb 22 13:05:18 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 22 13:08:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a8afa1

sys-kernel/installkernel: add 26

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 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 ..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 

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

2024-02-09 Thread Andrew Ammerlaan
commit: 1d01bdd9d2b54ac216f3dd0cdfb380b9c2dec67d
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb  9 12:44:45 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb  9 12:50:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d01bdd9

sys-kernel/installkernel: add 25

Signed-off-by: Andrew Ammerlaan  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 
7237cf0bff5c82a55968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482
 SHA512 
c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38

diff --git a/sys-kernel/installkernel/installkernel-25.ebuild 
b/sys-kernel/installkernel/installkernel-25.ebuild
new file mode 100644
index ..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}" >> 

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

2024-02-02 Thread Andrew Ammerlaan
commit: 9bd4f529f2f7861f323f2727a1b496987f5cdb14
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb  2 13:09:58 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb  2 13:11:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd4f529

sys-kernel/installkernel: drop 23

Signed-off-by: Andrew Ammerlaan  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..
--- 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 

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

2024-02-02 Thread Andrew Ammerlaan
commit: 357b8ab8dd80132444015ed099b7dca1af731362
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb  2 13:07:12 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb  2 13:11:18 2024 +
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  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 ..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 

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

2024-02-01 Thread Andrew Ammerlaan
commit: 3b0704586288958c44056d2da3fd9be9c3d733ea
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jan 30 12:46:51 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb  2 06:15:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b070458

sys-kernel/installkernel: add 23

Signed-off-by: Andrew Ammerlaan  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 ..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" >> 

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

2024-02-01 Thread Andrew Ammerlaan
commit: 60ff5a2bc473691cceda11de2fec46a0a155a3b4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jan 30 12:47:26 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb  2 06:16:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ff5a2b

sys-kernel/installkernel: drop 19

Signed-off-by: Andrew Ammerlaan  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..
--- 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" >> 

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

2024-01-29 Thread Andrew Ammerlaan
commit: 833a37f1917ee124d6bdbb644e262098a8769321
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jan 29 08:42:08 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jan 29 08:42:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833a37f1

sys-kernel/installkernel: drop 18-r1

Signed-off-by: Andrew Ammerlaan  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..
--- 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 

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

2024-01-29 Thread Andrew Ammerlaan
commit: 5772f824048870d525bb80f7a7040d3c11fca8ad
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jan 29 08:41:58 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jan 29 08:41:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5772f824

sys-kernel/installkernel: add 19

Signed-off-by: Andrew Ammerlaan  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 ..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" >> 

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

2024-01-27 Thread Andrew Ammerlaan
commit: 75455f3df748cb46221dcc8beadc241b4534e0fe
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 27 21:07:23 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 27 21:07:53 2024 +
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  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 @@

Generate an initrd or UKI on each kernel 
installation
Re-generate grub.cfg on each kernel 
installation
-   Rebuild external kernel modules 
before generating the initramfs
Use systemd's kernel-install to install 
kernels'
Install UKIs to ESP/EFI/Linux for EFI stub 
booting and/or bootloaders with support for auto-discovering UKIs
Build an UKI with systemd's ukify on each 
kernel installation



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

2024-01-25 Thread Andrew Ammerlaan
commit: ad92f751b3b0fb69c827a7a46b4d30c2a52191f7
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Jan 25 12:03:25 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jan 25 12:03:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad92f751

sys-kernel/installkernel: update HOMEPAGE

Signed-off-by: Andrew Ammerlaan  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}"



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

2024-01-24 Thread Sam James
commit: fd167060763672e6f4e8ad85cd063888e25ce762
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 25 01:37:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 25 01:37:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd167060

sys-kernel/installkernel: Stabilize 18 hppa, #922811

Signed-off-by: Sam James  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="



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

2024-01-24 Thread Andrew Ammerlaan
commit: 1cc761d02ffd4ed737edbb67562eb37b6f4845be
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 24 14:43:51 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 24 14:43:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc761d0

sys-kernel/installkernel: drop 15-r1, 17

Signed-off-by: Andrew Ammerlaan  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..
--- 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; 

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

2024-01-24 Thread Andrew Ammerlaan
commit: dd777824a5523f812a7fd267ae474320be536411
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 24 14:38:26 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 24 14:38:26 2024 +
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  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



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

2024-01-24 Thread Andrew Ammerlaan
commit: a326529793058c98a2765edda1f527038782
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 24 14:15:53 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 24 14:15:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3265297

sys-kernel/installkernel: stabilize 18 for amd64

Signed-off-by: Andrew Ammerlaan  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="



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

2024-01-24 Thread Andrew Ammerlaan
commit: 8e563cacd83a2c0fcba2472028b8d76c13cb7460
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 24 14:15:42 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 24 14:15:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e563cac

sys-kernel/installkernel-systemd: stabilize 4-r1 for amd64

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
index b86f44a773ed..966d2b793403 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 
 PDEPEND=">=sys-kernel/installkernel-14[systemd]"
 



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

2024-01-24 Thread Sam James
commit: eb05c3b41f107e9031d77998fc51353c57c78c67
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 13:37:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 13:37:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb05c3b4

sys-kernel/installkernel-systemd: Stabilize 4-r1 x86, #922811

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
index 9c8cd9a42f5d..b86f44a773ed 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 
 PDEPEND=">=sys-kernel/installkernel-14[systemd]"
 



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

2024-01-24 Thread Sam James
commit: 8e6173faeb0f2d0f5e4cfc4d6fe99e7e2ae5702c
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 13:37:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 13:37:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6173fa

sys-kernel/installkernel: Stabilize 18 x86, #922811

Signed-off-by: Sam James  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="



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

2024-01-24 Thread Sam James
commit: 2f9f0857d07d0c56747a38124f58a3551a37e8ee
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 10:58:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 10:58:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9f0857

sys-kernel/installkernel: Stabilize 18 ppc64, #922811

Signed-off-by: Sam James  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="



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

2024-01-24 Thread Sam James
commit: dd6a20464ef9a0877f8a7ea87eb8ff18ea5f381e
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 10:58:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 10:58:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6a2046

sys-kernel/installkernel: Stabilize 18 sparc, #922811

Signed-off-by: Sam James  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="



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

2024-01-24 Thread Sam James
commit: 786c563afa9e8dab94eb5e6f44347673a29181c1
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 10:58:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 10:58:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786c563a

sys-kernel/installkernel-systemd: Stabilize 4-r1 ppc64, #922811

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
index 53d5f61f4d50..9c8cd9a42f5d 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 
 PDEPEND=">=sys-kernel/installkernel-14[systemd]"
 



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

2024-01-24 Thread Sam James
commit: 445d4fc62acb06157567259d55b91c411af808d0
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 10:58:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 10:58:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445d4fc6

sys-kernel/installkernel-systemd: Stabilize 4-r1 arm64, #922811

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
index 9968f5728bd2..53d5f61f4d50 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 
 PDEPEND=">=sys-kernel/installkernel-14[systemd]"
 



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

2024-01-24 Thread Sam James
commit: 57b50ca3ff8873d066fef01ffbb9163ec56753d1
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 10:58:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 10:58:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b50ca3

sys-kernel/installkernel: Stabilize 18 ppc, #922811

Signed-off-by: Sam James  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="



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

2024-01-24 Thread Sam James
commit: 6ed01743f753e268478927ecfcba0ae3ea88982b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 24 10:58:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 24 10:58:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed01743

sys-kernel/installkernel: Stabilize 18 arm64, #922811

Signed-off-by: Sam James  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="



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

2024-01-22 Thread Andrew Ammerlaan
commit: efb4ffbb24c111cb7596dbed1309464452476008
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jan 22 13:55:37 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jan 22 13:55:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efb4ffbb

sys-kernel/installkernel-systemd: drop 2-r4, 2-r5

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../installkernel-systemd-2-r4.ebuild  | 37 --
 .../installkernel-systemd-2-r5.ebuild  | 34 
 2 files changed, 71 deletions(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
deleted file mode 100644
index b89b45be80e9..
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Wrap kernel-install from systemd as installkernel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 x86"
-
-RDEPEND="
-   !sys-kernel/installkernel
-   || (
-   sys-apps/systemd[gnuefi(-)]
-   sys-apps/systemd[boot(-)]
-   sys-apps/systemd[kernel-install(-)]
-   sys-apps/systemd-utils[boot]
-   sys-apps/systemd-utils[kernel-install(-)]
-   )
-"
-
-src_install() {
-   # we could technically use a symlink here but it would require
-   # us to know the correct path, and that implies /usr merge problems
-   into /
-   newsbin - installkernel <<-EOF
-   #!/usr/bin/env sh
-   exec kernel-install add "\${1}" "\${2}" --verbose
-   EOF
-
-   exeinto /usr/lib/kernel/install.d/
-   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
-   00-00machineid-directory.install
-}

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
deleted file mode 100644
index 8a88e9602d27..
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Wrap kernel-install from systemd as installkernel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
-
-RDEPEND="
-   !sys-kernel/installkernel
-   || (
-   sys-apps/systemd[kernel-install(-)]
-   sys-apps/systemd-utils[kernel-install(-)]
-   )
-"
-
-src_install() {
-   # we could technically use a symlink here but it would require
-   # us to know the correct path, and that implies /usr merge problems
-   into /
-   newsbin - installkernel <<-EOF
-   #!/usr/bin/env sh
-   exec kernel-install add "\${1}" "\${2}" --verbose
-   EOF
-
-   exeinto /usr/lib/kernel/install.d/
-   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
-   00-00machineid-directory.install
-}



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

2024-01-22 Thread Andrew Ammerlaan
commit: 20bdef42aa5dab4f6e77f0e4a8b923b694728dfb
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jan 22 13:55:09 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jan 22 13:55:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bdef42

sys-kernel/installkernel-systemd: stabilize 3 for amd64, arm64, ppc64, x86

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
index 2c0e8d48576c..eea709e13c17 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 
 RDEPEND="
!sys-kernel/installkernel



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

2024-01-19 Thread Andrew Ammerlaan
commit: bbd5f92e1c606a1f29923b47b203ff3121db3ee1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 19 21:32:49 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 19 21:33:33 2024 +
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  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 ..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 

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

2024-01-19 Thread Andrew Ammerlaan
commit: 91941778110d7aa5181f1ca2af17bfa25b7c645b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 19 10:56:56 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 19 10:57:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91941778

sys-kernel/installkernel: drop 16

Signed-off-by: Andrew Ammerlaan  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..
--- 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
-  

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

2024-01-19 Thread Andrew Ammerlaan
commit: 536a22a56713c5384b22f9056aff676638a9040d
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 19 10:56:43 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 19 10:57:10 2024 +
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  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 ..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" || 

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

2024-01-18 Thread Andrew Ammerlaan
commit: fa36fdb83abcb29412402ed7a2e88554d426c9fe
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Jan 18 10:20:57 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jan 18 10:21:00 2024 +
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  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 ..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" || 

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

2024-01-17 Thread Andrew Ammerlaan
commit: 26d726f5be02cecc0b61917f9150db587a1fa6b6
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan 17 20:50:53 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Jan 17 20:51:22 2024 +
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  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() {



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

2024-01-13 Thread Andrew Ammerlaan
commit: a6b0608e5ed75a68dfb1d5d6a31daa59ad6287c2
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 13 13:50:06 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 13 14:54:02 2024 +
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  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34776
Signed-off-by: Andrew Ammerlaan  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;
 }



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

2024-01-12 Thread Andrew Ammerlaan
commit: 107adc53bf7ee8319dab6c2b6724556b68e2f0fd
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 13 07:43:23 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 13 07:43:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107adc53

sys-kernel/installkernel: add 15

Signed-off-by: Andrew Ammerlaan  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 ..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"
+
+   

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

2024-01-12 Thread Andrew Ammerlaan
commit: 1e4515d0384b8cd88cb4b049e9a4a247dcba2c66
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 13 07:44:57 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 13 07:44:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4515d0

sys-kernel/installkernel: drop 14-r2

Signed-off-by: Andrew Ammerlaan  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..
--- 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
-   

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

2024-01-12 Thread Andrew Ammerlaan
commit: 5352b29c9332cd460e9e252c2e3e45a8b9fd183a
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 13 06:47:21 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 13 06:49:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5352b29c

sys-kernel/installkernel-systemd: move rdep to pdep

This helps portage figure out the correct upgrade path

Bug: https://bugs.gentoo.org/921975
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
index 10718b5ecdf2..9968f5728bd2 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 
-RDEPEND=">=sys-kernel/installkernel-14[systemd]"
+PDEPEND=">=sys-kernel/installkernel-14[systemd]"
 
 pkg_setup() {
elog "The wrapper functionality of ${PN} has been integrated into"



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

2024-01-12 Thread Andrew Ammerlaan
commit: 838f6d984abf0d07a4a705643f1ce37690137772
Author: Rahil Bhimjiani  rahil  rocks>
AuthorDate: Sat Jan 13 03:53:11 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 13 06:49:24 2024 +
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  rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/34775
Signed-off-by: Andrew Ammerlaan  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? (



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/, profiles/arch/s390/, profiles/arch/amd64/, ...

2024-01-12 Thread Andrew Ammerlaan
commit: bdb8aeba6fabfd4695add019170706afb805b432
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 12 20:30:07 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 12 20:30:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb8aeba

sys-kernel/installkernel: explicitly pull in plugin rdeps

Too many people have complained this is confusing. The original
to do it this way was because the grub flag does it this way.

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 profiles/arch/amd64/package.use.mask   | 1 +
 profiles/arch/arm/package.use.mask | 1 +
 profiles/arch/arm64/package.use.mask   | 3 ++-
 profiles/arch/base/package.use.mask| 1 +
 profiles/arch/loong/package.use.mask   | 1 +
 profiles/arch/riscv/package.use.mask   | 1 +
 profiles/arch/s390/package.use.mask| 4 
 profiles/arch/x86/package.use.mask | 1 +
 .../{installkernel-14-r1.ebuild => installkernel-14-r2.ebuild} | 7 +++
 9 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index e29940c01844..d4342c7d883c 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -398,6 +398,7 @@ sys-boot/grub:2 -grub_platforms_xen-32
 # sd-boot is not supported on all archs.
 sys-apps/systemd -boot -gnuefi -ukify
 sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
 
 # Ben de Groot  (2015-03-15)
 # media-libs/libbdplus is keyworded on amd64, so unmask the useflag

diff --git a/profiles/arch/arm/package.use.mask 
b/profiles/arch/arm/package.use.mask
index 97cd804fbc99..43c53495a4f5 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -139,6 +139,7 @@ net-im/prosody selinux
 # bug #729720
 sys-apps/systemd -boot -gnuefi -ukify
 sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
 
 # Joonas Niilola  (2021-01-15)
 # Dependency not keyworded on this arch.

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index 11f13e8431bc..f81227a0ad83 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andrew Ammerlaan  (2023-12-18)
@@ -167,6 +167,7 @@ media-sound/bluez-alsa man
 # bug #729720
 sys-apps/systemd -boot -gnuefi -ukify
 sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
 
 # Joonas Niilola  (2021-01-15)
 # Dependency not keyworded on this arch.

diff --git a/profiles/arch/base/package.use.mask 
b/profiles/arch/base/package.use.mask
index 7d3c676a98fb..d7c804f7b184 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -369,6 +369,7 @@ net-misc/moonlight mmal
 # sd-boot and ukify are not supported on all archs.
 sys-apps/systemd boot gnuefi ukify
 sys-apps/systemd-utils boot ukify
+sys-kernel/installkernel ukify
 
 # Ben de Groot  (2015-03-15)
 # Mask bdplus support and unmask on arches where libbdplus is keyworded.

diff --git a/profiles/arch/loong/package.use.mask 
b/profiles/arch/loong/package.use.mask
index 44dc74f4cdd8..c4927819cfed 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -111,6 +111,7 @@ app-accessibility/at-spi2-core dbus-broker
 # Newer sd-boot does not use gnuefi.
 >=sys-apps/systemd-254 -boot -ukify
 >=sys-apps/systemd-utils-254 -boot -ukify
+sys-kernel/installkernel -ukify
 
 # WANG Xuerui  (2023-04-16)
 # dev-python/pyopengl fails tests

diff --git a/profiles/arch/riscv/package.use.mask 
b/profiles/arch/riscv/package.use.mask
index 91d340e233d9..c40de70a3264 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -34,6 +34,7 @@ media-video/mpv lua_single_target_luajit 
-lua_single_target_lua5-1
 # sd-boot should work here.
 sys-apps/systemd -boot -boot -ukify
 sys-apps/systemd-utils -boot -ukify
+sys-kernel/installkernel -ukify
 
 # Sam James  (2023-05-10)
 # sys-cluster/ceph not keyworded here

diff --git a/profiles/arch/s390/package.use.mask 
b/profiles/arch/s390/package.use.mask
index eea643e25034..cc653abdeb60 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan  (2024-01-12)
+# dracut is not keyworded here
+sys-kernel/installkernel dracut
+
 # Sam James  (2024-01-02)
 # dev-libs/capstone not keyworded here
 dev-lang/php capstone

diff --git 

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

2024-01-12 Thread Andrew Ammerlaan
commit: a2e45b9748bc8a08d52e137da453a4d85f2e47e1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 12 20:15:14 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 12 20:15:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e45b97

sys-kernel/installkernel-systemd: depend on installkernel[systemd]

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...installkernel-systemd-4.ebuild => installkernel-systemd-4-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
similarity index 93%
rename from sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
rename to sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
index 73a4f2318f28..10718b5ecdf2 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 
-RDEPEND=">=sys-kernel/installkernel-14"
+RDEPEND=">=sys-kernel/installkernel-14[systemd]"
 
 pkg_setup() {
elog "The wrapper functionality of ${PN} has been integrated into"



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

2024-01-12 Thread Andrew Ammerlaan
commit: ec00b7c50c51d05c2b576d3670e91ffc1e2dd4f8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 12 11:44:08 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 12 11:45:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec00b7c5

sys-kernel/installkernel: fix S after rename

and set initrd/uki generators to none by default if unset, this
change makes USE=generic-uki work automatically. While of course
still retaining the possibility of manually overriding the config file

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel/installkernel-12.ebuild | 1 +
 .../{installkernel-14.ebuild => installkernel-14-r1.ebuild}  | 9 +
 2 files changed, 10 insertions(+)

diff --git a/sys-kernel/installkernel/installkernel-12.ebuild 
b/sys-kernel/installkernel/installkernel-12.ebuild
index b3fc7f5fa826..042e7cbdf2d6 100644
--- a/sys-kernel/installkernel/installkernel-12.ebuild
+++ b/sys-kernel/installkernel/installkernel-12.ebuild
@@ -7,6 +7,7 @@ DESCRIPTION="Gentoo fork of installkernel script from 
debianutils"
 HOMEPAGE="https://github.com/projg2/installkernel-gentoo;
 SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"

diff --git a/sys-kernel/installkernel/installkernel-14.ebuild 
b/sys-kernel/installkernel/installkernel-14-r1.ebuild
similarity index 91%
rename from sys-kernel/installkernel/installkernel-14.ebuild
rename to sys-kernel/installkernel/installkernel-14-r1.ebuild
index 4be27a583bfa..cb9f31daa48c 100644
--- a/sys-kernel/installkernel/installkernel-14.ebuild
+++ b/sys-kernel/installkernel/installkernel-14-r1.ebuild
@@ -7,6 +7,7 @@ DESCRIPTION="Gentoo fork of installkernel script from 
debianutils"
 HOMEPAGE="https://github.com/projg2/installkernel-gentoo;
 SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -61,14 +62,22 @@ src_install() {
else
echo "layout=bls" >> "${T}/install.conf" || die
fi
+
if use dracut; then
echo "initrd_generator=dracut" >> "${T}/install.conf" || die
if ! use ukify; then
echo "uki_generator=dracut" >> "${T}/install.conf" || 
die
fi
+   else
+   echo "initrd_generator=none" >> "${T}/install.conf" || die
fi
+
if use ukify; then
echo "uki_generator=ukify" >> "${T}/install.conf" || die
+   else
+   if ! use dracut; then
+   echo "uki_generator=none" >> "${T}/install.conf" || die
+   fi
fi
 
if [[ -s "${T}/install.conf" ]]; then



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

2024-01-12 Thread Andrew Ammerlaan
commit: 4c0e18bea2ae37ba19d0720867ebca5836f105c1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 12 11:11:09 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 12 11:24:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0e18be

sys-kernel/installkernel-systemd: add 4

4 is just a wrapper that depends on installkernel-gentoo.

This wrapper allows us to keep these changes in unstable for now, while
retaining the "split" behaviour on stable.

Bug: https://bugs.gentoo.org/917145
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
index 3457c156a0d3..2ff751ead627 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 
-RDEPEND=">=sys-kernel/installkernel-gentoo-13[systemd]"
+RDEPEND=">=sys-kernel/installkernel-gentoo-14"
 
 pkg_setup() {
elog "The wrapper functionality of ${PN} has been integrated into"



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

2024-01-12 Thread Andrew Ammerlaan
commit: bdd56b68122666ee19d8e9a755474b696a88fc23
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 12 11:03:30 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 12 11:24:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd56b68

sys-kernel/installkernel-gentoo: add 14

Changelog:
- added grub-mkconfig plugin for systemd's kernel-install
- call systemd's kernel-install if it is installed, this can be controlled
with the SYSTEMD_KERNEL_INSTALL env var, whose default is set by the ebuild
depending on USE=systemd
- imported plugins from installkernel-systemd
- clarified warning messages when dracut/ukify is not installed
- set some default install.conf based on the flags we already have for
the "legacy" install anyway. Use /etc/ instead of /usr/lib because systemd
already installs a dummy file to /usr/lib and we would have a file conflict
with this.

Bug: https://bugs.gentoo.org/917145
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 +
 .../installkernel-gentoo-14.ebuild | 85 ++
 sys-kernel/installkernel-gentoo/metadata.xml   |  1 +
 3 files changed, 87 insertions(+)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 92cd07a0ba25..e74c54c2b028 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1 +1,2 @@
 DIST installkernel-gentoo-12.tar.gz 4385 BLAKE2B 
2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a
 SHA512 
b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
+DIST installkernel-gentoo-14.tar.gz 5501 BLAKE2B 
cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504
 SHA512 
f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild
new file mode 100644
index ..4be27a583bfa
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild
@@ -0,0 +1,85 @@
+# 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"
+
+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-apps/debianutils-4.9-r1
+   systemd? (
+   || (
+   sys-apps/systemd[kernel-install(-)]
+   sys-apps/systemd-utils[kernel-install(-)]
+   )
+   )
+"
+
+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
+   fi
+   if use ukify; then
+   echo "uki_generator=ukify" >> "${T}/install.conf" || die
+   fi
+
+   if [[ -s "${T}/install.conf" ]]; then
+   insinto /etc/kernel
+   doins "${T}/install.conf"
+   fi
+
+   exeinto /usr/lib/kernel/install.d
+   

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

2024-01-12 Thread Andrew Ammerlaan
commit: 285bb764b6339b94621f68b7495a72a8235b0036
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 12 11:10:42 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 12 11:24:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285bb764

sys-kernel/installkernel-systemd: add 4

Bug: https://bugs.gentoo.org/917145
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../installkernel-systemd-4.ebuild | 23 ++
 1 file changed, 23 insertions(+)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
new file mode 100644
index ..3457c156a0d3
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=">=sys-kernel/installkernel-gentoo-13[systemd]"
+
+pkg_setup() {
+   elog "The wrapper functionality of ${PN} has been integrated into"
+   elog "sys-kernel/installkernel-gentoo[systemd]."
+   elog "${PN} can be safely removed and replaced:"
+   elog
+   elog "emerge --noreplace sys-kernel/installkernel-gentoo"
+   elog "emerge --depclean sys-kernel/installkernel-systemd"
+}



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

2024-01-09 Thread Andrew Ammerlaan
commit: 074c8222d5c11b710ad558d6c196fad36fb58ebf
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jan  9 08:25:01 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jan  9 08:25:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=074c8222

sys-kernel/installkernel-gentoo: add 12

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 +
 .../installkernel-gentoo-12.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 1b9400f85f38..707f5edb12d3 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1 +1,2 @@
 DIST installkernel-gentoo-11.tar.gz 4427 BLAKE2B 
ef71c5e4bb928c60975812a905e2a05f4df98ae6ad8f8e515aee9528e2418a2cb0481828b8e68721f9d691192a25ab802488ee1cd4e796133442431bac1a3c0b
 SHA512 
d39d3d9222507bafde288ccab49cc11310dfe5a480ca17b5580514ac6268d3cd4c1b6c0fbe61b7dcd9712876e50736d832c4991d64e1920a4f4df30ccbbfc9d6
+DIST installkernel-gentoo-12.tar.gz 4385 BLAKE2B 
2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a
 SHA512 
b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild
new file mode 100644
index ..b3fc7f5fa826
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild
@@ -0,0 +1,56 @@
+# 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"
+
+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
+   !

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

2024-01-09 Thread Andrew Ammerlaan
commit: 78295aa8f256055a6c394d3ad108db0dc8333f5e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jan  9 08:25:21 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jan  9 08:25:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78295aa8

sys-kernel/installkernel-gentoo: drop 11

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 -
 .../installkernel-gentoo-11.ebuild | 56 --
 2 files changed, 57 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 707f5edb12d3..92cd07a0ba25 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,2 +1 @@
-DIST installkernel-gentoo-11.tar.gz 4427 BLAKE2B 
ef71c5e4bb928c60975812a905e2a05f4df98ae6ad8f8e515aee9528e2418a2cb0481828b8e68721f9d691192a25ab802488ee1cd4e796133442431bac1a3c0b
 SHA512 
d39d3d9222507bafde288ccab49cc11310dfe5a480ca17b5580514ac6268d3cd4c1b6c0fbe61b7dcd9712876e50736d832c4991d64e1920a4f4df30ccbbfc9d6
 DIST installkernel-gentoo-12.tar.gz 4385 BLAKE2B 
2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a
 SHA512 
b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild
deleted file mode 100644
index b3fc7f5fa826..
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild
+++ /dev/null
@@ -1,56 +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"
-
-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
-   !

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

2024-01-08 Thread Andrew Ammerlaan
commit: ce818c6629c7efe632e615793fa7050b7c7907c6
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jan  9 06:40:21 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jan  9 06:41:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce818c66

sys-kernel/installkernel-gentoo: add 11

fixes dracut/ukify gen on arches where the kernel image is in the
kernel source root

Closes: https://bugs.gentoo.org/921622
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 +
 .../installkernel-gentoo-11.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 306d1e35a9c7..9c4e17876d55 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1 +1,2 @@
 DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 
482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0
 SHA512 
ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a
+DIST installkernel-gentoo-11.tar.gz 4427 BLAKE2B 
ef71c5e4bb928c60975812a905e2a05f4df98ae6ad8f8e515aee9528e2418a2cb0481828b8e68721f9d691192a25ab802488ee1cd4e796133442431bac1a3c0b
 SHA512 
d39d3d9222507bafde288ccab49cc11310dfe5a480ca17b5580514ac6268d3cd4c1b6c0fbe61b7dcd9712876e50736d832c4991d64e1920a4f4df30ccbbfc9d6

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild
new file mode 100644
index ..b3fc7f5fa826
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-11.ebuild
@@ -0,0 +1,56 @@
+# 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"
+
+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
+   !

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

2024-01-08 Thread Andrew Ammerlaan
commit: 76d617ec28c821b9ec4c319492c203e30e91c232
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jan  9 06:41:29 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jan  9 06:41:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d617ec

sys-kernel/installkernel-gentoo: drop 10

Bug: https://bugs.gentoo.org/921622
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 -
 .../installkernel-gentoo-10.ebuild | 56 --
 2 files changed, 57 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 9c4e17876d55..1b9400f85f38 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,2 +1 @@
-DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 
482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0
 SHA512 
ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a
 DIST installkernel-gentoo-11.tar.gz 4427 BLAKE2B 
ef71c5e4bb928c60975812a905e2a05f4df98ae6ad8f8e515aee9528e2418a2cb0481828b8e68721f9d691192a25ab802488ee1cd4e796133442431bac1a3c0b
 SHA512 
d39d3d9222507bafde288ccab49cc11310dfe5a480ca17b5580514ac6268d3cd4c1b6c0fbe61b7dcd9712876e50736d832c4991d64e1920a4f4df30ccbbfc9d6

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
deleted file mode 100644
index b3fc7f5fa826..
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
+++ /dev/null
@@ -1,56 +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"
-
-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
-   !

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

2024-01-07 Thread Andrew Ammerlaan
commit: 3b3536fbf055a1b8833a0fab56eabad382a1d8d9
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan  3 10:08:29 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan  7 17:28:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3536fb

sys-kernel/installkernel-gentoo: drop 7

Signed-off-by: Andrew Ammerlaan  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/33727
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 -
 .../installkernel-gentoo-7.ebuild  | 39 --
 2 files changed, 40 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index af6a85c2cd65..306d1e35a9c7 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,2 +1 @@
 DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 
482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0
 SHA512 
ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a
-DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
deleted file mode 100644
index a62868a3c86b..
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2023 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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="grub"
-
-RDEPEND="
-   >=sys-apps/debianutils-4.9-r1
-   !

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

2024-01-07 Thread Andrew Ammerlaan
commit: 8aa237e185cd8ee5507fed05ffe20206a33becc1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jan  3 10:08:17 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan  7 17:28:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa237e1

sys-kernel/installkernel-gentoo: stabilize 10 for ALLARCHES

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
index 798ac29e8a31..b3fc7f5fa826 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
 
 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 uki ukify"
 
 RDEPEND="



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

2023-12-21 Thread Andrew Ammerlaan
commit: 63a4f7b64a3686b77d6544ce9c56dfe2f58a9be2
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 21 09:24:01 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 21 09:29:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a4f7b6

sys-kernel/installkernel-systemd: add 3

adds 10-copy-prebuilt.install. This does exactly the same as
what 50-dracut.install does when it finds an existing image at
the same place as the kernel. However, with the upcoming
USE=generic-uki on gentoo-kernel* we want this behaviour also
when dracut is not installed.

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...nstallkernel-systemd-3-10-copy-prebuilt.install | 24 +++
 .../installkernel-systemd-3.ebuild | 36 ++
 2 files changed, 60 insertions(+)

diff --git 
a/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
 
b/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
new file mode 100644
index ..56f4641d9664
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+
+# this file is installed by sys-kernel/installkernel-systemd
+
+COMMAND="${1}"
+KERNEL_IMAGE="${4}"
+
+if [ "${COMMAND}" != "add" ]; then
+   exit 0
+fi
+
+IMAGE_DIR="$(dirname ${KERNEL_IMAGE})"
+INITRD=${IMAGE_DIR}/initrd
+UKI=${IMAGE_DIR}/uki.efi
+
+if [ -f "${INITRD}" ]; then
+   echo "Copying prebuilt initramfs to staging area"
+   cp "${INITRD}" "${KERNEL_INSTALL_STAGING_AREA}/initrd" || exit 1
+fi
+
+if [ -f "${UKI}" ]; then
+   echo "Copying prebuilt UKI to staging area"
+   cp "${UKI}" "${KERNEL_INSTALL_STAGING_AREA}/uki.efi" || exit 1
+fi

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
new file mode 100644
index ..f5c22ec7a318
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+   !sys-kernel/installkernel-gentoo
+   || (
+   sys-apps/systemd[kernel-install(-)]
+   sys-apps/systemd-utils[kernel-install(-)]
+   )
+"
+
+src_install() {
+   # we could technically use a symlink here but it would require
+   # us to know the correct path, and that implies /usr merge problems
+   into /
+   newsbin - installkernel <<-EOF
+   #!/usr/bin/env sh
+   exec kernel-install add "\${1}" "\${2}" --verbose
+   EOF
+
+   exeinto /usr/lib/kernel/install.d/
+   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
+   00-00machineid-directory.install
+   newexe "${FILESDIR}/${PN}-3-10-copy-prebuilt.install" \
+   10-copy-prebuilt.install
+}



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

2023-12-08 Thread Andrew Ammerlaan
commit: f93d00d7c5a3da8fa85370b2c731c0b55b363639
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Dec  8 14:09:05 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Dec  8 14:10:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93d00d7

sys-kernel/installkernel-gentoo: add 10

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 +
 .../installkernel-gentoo-10.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index ae507d8e2853..db6f3d1545a1 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,2 +1,3 @@
+DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 
482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0
 SHA512 
ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e
 DIST installkernel-gentoo-9.tar.gz 4292 BLAKE2B 
4d12b5188aaca90a56514f7a3435731b7d2ce56c7bfab63b715e849d3bf588c7cc3b7ae980ed8b491d64166f1e557fb95e949c5a82642ae90d26ff2e4d76f377
 SHA512 
1b34e1c51302a17254e6daa3fa03601f4b221b58f66043ca1b85aa01ad5ac03f3d7bee7328df786f72796c4bead732d265a22324bf1d34d09c9303cad8bbb009

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
new file mode 100644
index ..798ac29e8a31
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2023 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"
+
+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
+   !

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

2023-12-08 Thread Andrew Ammerlaan
commit: 0592675bb383a9ce5980762bc0f1422a164e2af7
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Dec  8 14:09:14 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Dec  8 14:10:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0592675b

sys-kernel/installkernel-gentoo: drop 9

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 -
 .../installkernel-gentoo-9.ebuild  | 56 --
 2 files changed, 57 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index db6f3d1545a1..af6a85c2cd65 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,3 +1,2 @@
 DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 
482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0
 SHA512 
ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e
-DIST installkernel-gentoo-9.tar.gz 4292 BLAKE2B 
4d12b5188aaca90a56514f7a3435731b7d2ce56c7bfab63b715e849d3bf588c7cc3b7ae980ed8b491d64166f1e557fb95e949c5a82642ae90d26ff2e4d76f377
 SHA512 
1b34e1c51302a17254e6daa3fa03601f4b221b58f66043ca1b85aa01ad5ac03f3d7bee7328df786f72796c4bead732d265a22324bf1d34d09c9303cad8bbb009

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-9.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-9.ebuild
deleted file mode 100644
index 798ac29e8a31..
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2023 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"
-
-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
-   !

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

2023-12-08 Thread Arthur Zamarin
commit: 2be9567cb04dc298befcb20cb58e0029aed6dd3c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  8 12:54:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  8 12:54:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be9567c

sys-kernel/installkernel-systemd: Keyword 2-r5 s390, #917558

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
index 4969927ed02b..22733be65a2a 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



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

2023-12-08 Thread Andrew Ammerlaan
commit: b2e89f30eb8e8b3a1e45e8070f597a3c8889ee97
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Dec  8 11:30:10 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Dec  8 11:30:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e89f30

sys-kernel/installkernel-gentoo: drop 8

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 -
 .../installkernel-gentoo-8.ebuild  | 56 --
 2 files changed, 57 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index ead58fa98298..ae507d8e2853 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,3 +1,2 @@
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e
-DIST installkernel-gentoo-8.tar.gz 4067 BLAKE2B 
0b414331be8d257d79d7f8b8e4bda7e162eb414712a598d5ab0c5ee2188ff4506ee2af6ea15e937ad4e396599515c19614547c92f79e9f0d593f6c48c39441ec
 SHA512 
b15a8ebac59693dd7450379e4054967ab35d3423b0db3e43da3dbac83d47fca5c537d32e6182423cf989833823c1f52ea147cd02091fbca24ee2c39aeea895c7
 DIST installkernel-gentoo-9.tar.gz 4292 BLAKE2B 
4d12b5188aaca90a56514f7a3435731b7d2ce56c7bfab63b715e849d3bf588c7cc3b7ae980ed8b491d64166f1e557fb95e949c5a82642ae90d26ff2e4d76f377
 SHA512 
1b34e1c51302a17254e6daa3fa03601f4b221b58f66043ca1b85aa01ad5ac03f3d7bee7328df786f72796c4bead732d265a22324bf1d34d09c9303cad8bbb009

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
deleted file mode 100644
index 798ac29e8a31..
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2023 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"
-
-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
-   !

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

2023-12-08 Thread Andrew Ammerlaan
commit: cfb5f8f285affb49b83a2560488973b9c188e70e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Dec  8 11:29:32 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Dec  8 11:29:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb5f8f2

sys-kernel/installkernel-gentoo: add 9

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 +
 .../installkernel-gentoo-9.ebuild  | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 2655a423d9e2..ead58fa98298 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,2 +1,3 @@
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e
 DIST installkernel-gentoo-8.tar.gz 4067 BLAKE2B 
0b414331be8d257d79d7f8b8e4bda7e162eb414712a598d5ab0c5ee2188ff4506ee2af6ea15e937ad4e396599515c19614547c92f79e9f0d593f6c48c39441ec
 SHA512 
b15a8ebac59693dd7450379e4054967ab35d3423b0db3e43da3dbac83d47fca5c537d32e6182423cf989833823c1f52ea147cd02091fbca24ee2c39aeea895c7
+DIST installkernel-gentoo-9.tar.gz 4292 BLAKE2B 
4d12b5188aaca90a56514f7a3435731b7d2ce56c7bfab63b715e849d3bf588c7cc3b7ae980ed8b491d64166f1e557fb95e949c5a82642ae90d26ff2e4d76f377
 SHA512 
1b34e1c51302a17254e6daa3fa03601f4b221b58f66043ca1b85aa01ad5ac03f3d7bee7328df786f72796c4bead732d265a22324bf1d34d09c9303cad8bbb009

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-9.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-9.ebuild
new file mode 100644
index ..798ac29e8a31
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2023 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"
+
+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
+   !

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

2023-12-05 Thread Sam James
commit: fdd9147ae158ad02adddf9c16818cd41a91fef74
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  6 07:08:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  6 07:08:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd9147a

sys-kernel/installkernel-gentoo: enable dracut by default

We get conflicts by default otherwise. This is also really what the common
case is anyway.

Closes: https://bugs.gentoo.org/919315
Fixes: db0195c3d66fc9ca1ee966b2177b2174a7d7bd02
Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
index 92187583ad00..798ac29e8a31 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
 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



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

2023-12-05 Thread Andrew Ammerlaan
commit: 1c33ebc24c171bb94db6ce3b1258acf2cf6a76a8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Dec  5 13:14:51 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Dec  5 13:15:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c33ebc2

sys-kernel/installkernel-gentoo: mark ALLARCHES

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-kernel/installkernel-gentoo/metadata.xml 
b/sys-kernel/installkernel-gentoo/metadata.xml
index b8c60006abec..11418da8042d 100644
--- a/sys-kernel/installkernel-gentoo/metadata.xml
+++ b/sys-kernel/installkernel-gentoo/metadata.xml
@@ -14,4 +14,5 @@

projg2/installkernel-gentoo

+   
 



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

2023-12-05 Thread Andrew Ammerlaan
commit: 2fcd8dc37c1d2862272857deab281a7db1ed9d1d
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Dec  5 13:15:18 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Dec  5 13:15:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fcd8dc3

sys-kernel/installkernel-systemd: mark ALLARCHES

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-systemd/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-kernel/installkernel-systemd/metadata.xml 
b/sys-kernel/installkernel-systemd/metadata.xml
index fae0ca9e8b97..d0bc8cdd567e 100644
--- a/sys-kernel/installkernel-systemd/metadata.xml
+++ b/sys-kernel/installkernel-systemd/metadata.xml
@@ -5,4 +5,5 @@
dist-ker...@gentoo.org
Distribution Kernel Project

+   
 



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

2023-12-05 Thread Andrew Ammerlaan
commit: ce11e1fb15f13927a35a9cbe0c1056d465bc541a
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Nov 22 10:50:13 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Dec  5 10:27:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce11e1fb

sys-kernel/installkernel-gentoo: add version 8

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  1 +
 .../installkernel-gentoo-8.ebuild  | 56 ++
 sys-kernel/installkernel-gentoo/metadata.xml   |  3 ++
 3 files changed, 60 insertions(+)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index 94b553d659cd..2655a423d9e2 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1 +1,2 @@
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e
+DIST installkernel-gentoo-8.tar.gz 4067 BLAKE2B 
0b414331be8d257d79d7f8b8e4bda7e162eb414712a598d5ab0c5ee2188ff4506ee2af6ea15e937ad4e396599515c19614547c92f79e9f0d593f6c48c39441ec
 SHA512 
b15a8ebac59693dd7450379e4054967ab35d3423b0db3e43da3dbac83d47fca5c537d32e6182423cf989833823c1f52ea147cd02091fbca24ee2c39aeea895c7

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
new file mode 100644
index ..92187583ad00
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2023 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"
+
+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
+   !Distribution Kernel Project


+   Generate an initrd or UKI on each kernel 
installation
Re-generate grub.cfg on each kernel 
installation
+   Install UKIs to ESP/EFI/Linux for EFI stub 
booting and/or bootloaders with support for auto-discovering UKIs
+   Build an UKI with systemd's ukify on each 
kernel installation


projg2/installkernel-gentoo



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

2023-12-02 Thread Arthur Zamarin
commit: ce93f4a6dd68ed1c2fa4ca87adb781782fe8a5f7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  2 09:23:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  2 09:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce93f4a6

sys-kernel/installkernel-systemd: Keyword 2-r5 ppc, #917558

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
index 9bd1ef7e7ffa..4969927ed02b 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



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

2023-11-27 Thread Jakov Smolić
commit: b791a01ea4965871d2451c9c8a52dcbf2a6824cc
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Nov 27 14:21:16 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Nov 27 14:21:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b791a01e

sys-kernel/installkernel-systemd: Keyword 2-r5 riscv, #917558

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
index b8f0b678b39d..2683fd47e009 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



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

2023-11-18 Thread Sam James
commit: e221522d9213eb985209e8ba930499be2c15c943
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 18 14:54:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 18 14:54:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e221522d

sys-kernel/installkernel-systemd: Keyword 2-r5 sparc, #917558

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
index a41db63ba517..b8f0b678b39d 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~sparc x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



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

2023-11-18 Thread Sam James
commit: 80b36881c4ef82681bbb1c64fbd73a7dabc9f763
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 18 14:49:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 18 14:49:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b36881

sys-kernel/installkernel-systemd: Keyword 2-r5 arm, #917558

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
index bf7bd29ba0a5..a41db63ba517 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



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

2023-11-10 Thread Sam James
commit: 4ba3e5e0f675dc5a1b7477eb73c7ea05d5b5c26b
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 11 04:42:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 11 04:43:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba3e5e0

sys-kernel/installkernel-systemd: drop attempt to emulate USE flag renames

This ends up confusing Portage to an appalling level so we can't carry on with 
it,
even though I liked the idea and tried it myself with the gnuefi->boot rename.

(I'm not sure if that actually worked properly or if the third-order 
kernel-install
"rename" bit tipped it over the edge?)

Stable versions of systemd & systemd-utils have the new flags, so just simplify
the || ( ... ) to systemd[kernel-install(-)] and 
systemd-boot[kernel-install(-)].

Bug: https://bugs.gentoo.org/917145
Signed-off-by: Sam James  gentoo.org>

 .../installkernel-systemd-2-r5.ebuild  | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
new file mode 100644
index ..bf7bd29ba0a5
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~loong ppc64 x86"
+
+RDEPEND="
+   !sys-kernel/installkernel-gentoo
+   || (
+   sys-apps/systemd[kernel-install(-)]
+   sys-apps/systemd-utils[kernel-install(-)]
+   )
+"
+
+src_install() {
+   # we could technically use a symlink here but it would require
+   # us to know the correct path, and that implies /usr merge problems
+   into /
+   newsbin - installkernel <<-EOF
+   #!/usr/bin/env sh
+   exec kernel-install add "\${1}" "\${2}" --verbose
+   EOF
+
+   exeinto /usr/lib/kernel/install.d/
+   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
+   00-00machineid-directory.install
+}



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

2023-11-09 Thread Andrew Ammerlaan
commit: 6e35ad7286f9f1ff370bb50139e080159fbdf758
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Nov  9 08:42:15 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Nov  9 08:42:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e35ad72

sys-kernel/installkernel-systemd: update DESCRIPTION

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
index d7515ea40e93..219ca981dfe2 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
 S="${WORKDIR}"
 



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

2023-11-08 Thread Andrew Ammerlaan
commit: 3f27e12a55cf0b4c4d82e09df5b0d9daeef92703
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Nov  8 19:20:17 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Nov  9 07:27:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f27e12a

sys-kernel/installkernel-systemd: drop 2-r1, 2-r3

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../files/00-00machineid-directory.install | 28 -
 .../installkernel-systemd-2-r1.ebuild  | 29 --
 .../installkernel-systemd-2-r3.ebuild  | 35 --
 3 files changed, 92 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install 
b/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
deleted file mode 100644
index 06a519577f76..
--- a/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# this file is installed by sys-kernel/installkernel-systemd
-
-COMMAND="${1}"
-ENTRY_DIR_ABS="${3}"
-
-# this is exported by kernel-install
-if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
-exit 0
-fi
-
-if [[ $COMMAND != add ]]; then
-exit 0
-fi
-
-# If the machine-id dir does not exist (e.g. $ESP/)
-# create it. It receives values directly from kernel-install.
-# This is the only function of this plugin.
-MACHINE_ID_DIR="${ENTRY_DIR_ABS%/*}"
-if ! [[ -d "${MACHINE_ID_DIR}" ]]; then
-   if [[ "${KERNEL_INSTALL_VERBOSE}" -gt 0 ]]; then
-   echo "+mkdir -v -p ${MACHINE_ID_DIR}"
-   mkdir -v -p "${MACHINE_ID_DIR}"
-   else
-   mkdir -p "${MACHINE_ID_DIR}"
-   fi
-fi

diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild 
b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
deleted file mode 100644
index b4b0308233e7..
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-S=${WORKDIR}
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] )
-   !https://wiki.gentoo.org/wiki/No_homepage;
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 x86"
-
-RDEPEND="
-   !sys-kernel/installkernel-gentoo
-   || (
-   sys-apps/systemd[gnuefi(-)]
-   sys-apps/systemd[boot(-)]
-   sys-apps/systemd-utils[boot]
-   )
-"
-
-src_install() {
-   # we could technically use a symlink here but it would require
-   # us to know the correct path, and that implies /usr merge problems
-   into /
-   newsbin - installkernel <<-EOF
-   #!/usr/bin/env sh
-   exec kernel-install add "\${1}" "\${2}"
-   EOF
-
-   exeinto /usr/lib/kernel/install.d/
-   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
-   00-00machineid-directory.install
-}



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/, eclass/, profiles/arch/powerpc/ppc64/, ...

2023-11-08 Thread Andrew Ammerlaan
commit: 784bf231299964f1ef28fb33534ee916bc377bca
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Nov  8 13:22:06 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Nov  9 07:27:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784bf231

*/*: move sys-kernel/installkernel-systemd-boot to 
sys-kernel/installkernel-systemd

This reflects better that we don't necessarily need the systemd bootloader
to use the systemd kernel-install system.

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 eclass/kernel-install.eclass| 2 +-
 profiles/arch/powerpc/ppc64/package.mask| 2 +-
 profiles/features/prefix/package.mask   | 2 +-
 profiles/updates/4Q-2023| 1 +
 sys-apps/debianutils/debianutils-5.14.ebuild| 2 +-
 sys-apps/debianutils/debianutils-5.7.ebuild | 2 +-
 sys-apps/debianutils/debianutils-5.8.ebuild | 2 +-
 sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild   | 2 +-
 .../files/00-00machineid-directory.install  | 2 +-
 .../files/installkernel-systemd-2-r2-00-00machineid-directory.install}  | 2 +-
 .../installkernel-systemd-2-r1.ebuild}  | 0
 .../installkernel-systemd-2-r3.ebuild}  | 0
 .../installkernel-systemd-2-r4.ebuild}  | 0
 .../{installkernel-systemd-boot => installkernel-systemd}/metadata.xml  | 0
 14 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index c1b9798a9ff9..03638cd2c57b 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -50,7 +50,7 @@ RESTRICT+="
 IDEPEND="
|| (
sys-kernel/installkernel-gentoo
-   sys-kernel/installkernel-systemd-boot
+   sys-kernel/installkernel-systemd
)
initramfs? ( >=sys-kernel/dracut-049-r3 )"
 # needed by objtool that is installed along with the kernel and used

diff --git a/profiles/arch/powerpc/ppc64/package.mask 
b/profiles/arch/powerpc/ppc64/package.mask
index ddeda73b9834..8b4559de7a95 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -7,7 +7,7 @@
 
 # Sam James  (2022-10-08)
 # sys-boot/gnu-efi isn't keyworded here right now
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
 
 # Michał Górny  (2022-08-25)
 # Only ppc64le binpkg is provided.

diff --git a/profiles/features/prefix/package.mask 
b/profiles/features/prefix/package.mask
index 32df49a3a6c4..3a54bbdc93cb 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -13,6 +13,6 @@ gnome-extra/gnome-user-share
 gnome-extra/office-runner
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
 sys-process/systemd-cron
 www-misc/profile-sync-daemon

diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index a543f3f9d4c7..a72fa0f84d1b 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -17,3 +17,4 @@ move dev-python/python-discid dev-python/discid
 move dev-python/py-amqp dev-python/amqp
 move dev-python/pyre2 dev-python/fb-re2
 move dev-python/python-sshpubkeys dev-python/sshpubkeys
+move sys-kernel/installkernel-systemd-boot sys-kernel/installkernel-systemd

diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild 
b/sys-apps/debianutils/debianutils-5.14.ebuild
index f56e99e6a6b0..c71e9cb0196b 100644
--- a/sys-apps/debianutils/debianutils-5.14.ebuild
+++ b/sys-apps/debianutils/debianutils-5.14.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
-   sys-kernel/installkernel-systemd-boot
+   sys-kernel/installkernel-systemd
)
)
 "

diff --git a/sys-apps/debianutils/debianutils-5.7.ebuild 
b/sys-apps/debianutils/debianutils-5.7.ebuild
index 358f820b7322..0cc841149e59 100644
--- a/sys-apps/debianutils/debianutils-5.7.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
|| (
sys-kernel/installkernel-gentoo
-   sys-kernel/installkernel-systemd-boot
+   sys-kernel/installkernel-systemd
)
)"
 

diff --git a/sys-apps/debianutils/debianutils-5.8.ebuild 
b/sys-apps/debianutils/debianutils-5.8.ebuild
index 3bd7fca2ed79..1909cc22de71 100644
--- a/sys-apps/debianutils/debianutils-5.8.ebuild
+++ b/sys-apps/debianutils/debianutils-5.8.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
installkernel? (
 

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

2023-11-08 Thread Andrew Ammerlaan
commit: eb476ae53b32f8bcf11fd1cbdef4a272bee67aad
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Nov  8 13:14:18 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Nov  9 07:27:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb476ae5

sys-kernel/installkernel-systemd-boot: allow systemd(-utils)[kernel-install]

We can use kernel-install with other boot loaders if we provide suitable
plugins in /usr/lib/kernel/install. This is part of the effort to
allow users to use other initrd generators for the dist-kernels.

And make kernel-install verbose, otherwise it doesn't output anything at all
during dist-kernel install.

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../installkernel-systemd-boot-2-r4.ebuild | 37 ++
 1 file changed, 37 insertions(+)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
new file mode 100644
index ..d7515ea40e93
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~loong ppc64 x86"
+
+RDEPEND="
+   !sys-kernel/installkernel-gentoo
+   || (
+   sys-apps/systemd[gnuefi(-)]
+   sys-apps/systemd[boot(-)]
+   sys-apps/systemd[kernel-install(-)]
+   sys-apps/systemd-utils[boot]
+   sys-apps/systemd-utils[kernel-install(-)]
+   )
+"
+
+src_install() {
+   # we could technically use a symlink here but it would require
+   # us to know the correct path, and that implies /usr merge problems
+   into /
+   newsbin - installkernel <<-EOF
+   #!/usr/bin/env sh
+   exec kernel-install add "\${1}" "\${2}" --verbose
+   EOF
+
+   exeinto /usr/lib/kernel/install.d/
+   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
+   00-00machineid-directory.install
+}



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

2023-10-15 Thread Sam James
commit: d8139eeaa48ba16b399aff35986af5077286b3bd
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 13:39:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 13:39:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8139eea

sys-kernel/installkernel-systemd-boot: fix filename

Didn't realise PF was used.

Fixes: 4f05b0b3d50b919a7e352e78dbbd2c26732a
Signed-off-by: Sam James  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
index e496a6f3c948..6ecb8c8f7702 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
@@ -30,6 +30,6 @@ src_install() {
EOF
 
exeinto /usr/lib/kernel/install.d/
-   newexe "${FILESDIR}/${PF}-00-00machineid-directory.install" \
+   newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
00-00machineid-directory.install
 }



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

2023-10-15 Thread Sam James
commit: 4f05b0b3d50b919a7e352e78dbbd2c26732a
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 13:05:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 13:05:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f05

sys-kernel/installkernel-systemd-boot: fix systemd dep for boot

Signed-off-by: Sam James  gentoo.org>

 ...systemd-boot-2-r2.ebuild => installkernel-systemd-boot-2-r3.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
similarity index 93%
rename from 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
rename to 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
index 724e9cd11d64..adaa42b26cdc 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 RDEPEND="
!sys-kernel/installkernel-gentoo
|| (
-   sys-apps/systemd
+   sys-apps/systemd[gnuefi(-)]
+   sys-apps/systemd[boot(-)]
sys-apps/systemd-utils[boot]
)
 "



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

2023-10-15 Thread Sam James
commit: 439e47a0a3a335569731de370e9e793f50fccab4
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 15 13:06:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 15 13:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439e47a0

sys-kernel/installkernel-systemd-boot: stabilize 2-r3 for amd64, arm64, ppc64, 
x86

Signed-off-by: Sam James  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
index adaa42b26cdc..e496a6f3c948 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



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

2023-09-07 Thread WANG Xuerui
commit: 4f0356796bb38bb04101d87840b891783d2f3a6e
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Sep  7 20:34:36 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Sep  7 20:36:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f035679

sys-kernel/installkernel-systemd-boot: keyword 2-r2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 .../installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
index ddf32065d8d1..724e9cd11d64 100644
--- 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 
 RDEPEND="
!sys-kernel/installkernel-gentoo



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd-boot/files/, ...

2023-06-22 Thread Andrew Ammerlaan
commit: 0a05585bfc3f37c69d8b694205339499860a0b42
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jun 20 19:08:06 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jun 22 06:28:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a05585b

sys-kernel/installkernel-systemd-boot: no mkdir machineid if using uki

Uki's are installed to ESP/Linux, we don't need this empty directory

Plus an EAPI bump while we are touching the package

Signed-off-by: Andrew Ammerlaan  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/31559
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...temd-boot-2-r2-00-00machineid-directory.install | 32 
 .../installkernel-systemd-boot-2-r2.ebuild | 34 ++
 2 files changed, 66 insertions(+)

diff --git 
a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
 
b/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
new file mode 100644
index ..5fa3bbeffc04
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# this file is installed by sys-kernel/installkernel-systemd-boot
+
+COMMAND="${1}"
+ENTRY_DIR_ABS="${3}"
+
+# this is exported by kernel-install
+if [ -z "${KERNEL_INSTALL_MACHINE_ID}" ]; then
+   exit 0
+fi
+
+if [ "${KERNEL_INSTALL_LAYOUT}" = "uki" ]; then
+   exit 0
+fi
+
+if [ "${COMMAND}" != "add" ]; then
+   exit 0
+fi
+
+# If the machine-id dir does not exist (e.g. $ESP/)
+# create it. It receives values directly from kernel-install.
+# This is the only function of this plugin.
+MACHINE_ID_DIR="${ENTRY_DIR_ABS%/*}"
+if ! [ -d "${MACHINE_ID_DIR}" ]; then
+   if [ "${KERNEL_INSTALL_VERBOSE}" = "1" ]; then
+   echo "+mkdir -v -p ${MACHINE_ID_DIR}"
+   mkdir -v -p "${MACHINE_ID_DIR}"
+   else
+   mkdir -p "${MACHINE_ID_DIR}"
+   fi
+fi

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
new file mode 100644
index ..ddf32065d8d1
--- /dev/null
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+   !sys-kernel/installkernel-gentoo
+   || (
+   sys-apps/systemd
+   sys-apps/systemd-utils[boot]
+   )
+"
+
+src_install() {
+   # we could technically use a symlink here but it would require
+   # us to know the correct path, and that implies /usr merge problems
+   into /
+   newsbin - installkernel <<-EOF
+   #!/usr/bin/env sh
+   exec kernel-install add "\${1}" "\${2}"
+   EOF
+
+   exeinto /usr/lib/kernel/install.d/
+   newexe "${FILESDIR}/${PF}-00-00machineid-directory.install" \
+   00-00machineid-directory.install
+}



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

2023-06-14 Thread Sam James
commit: a8654342a707fdd8f95f4a7069a8a36a21aebd37
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 02:25:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 02:25:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8654342

sys-kernel/installkernel-systemd-boot: drop sys-apps/systemd-boot dep

We don't want Portage to try cling to this obsolete meta which just
depends on systemd-utils[boot] anyway.

Signed-off-by: Sam James  gentoo.org>

 ...l-systemd-boot-2.ebuild => installkernel-systemd-boot-2-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
similarity index 85%
rename from 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
rename to 
sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
index 9c598e9ea948..b4b0308233e7 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2.ebuild
+++ 
b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 x86"
 
-RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] 
sys-boot/systemd-boot )
+RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] )
!

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

2023-04-12 Thread Michał Górny
commit: c92670d82b9e3cec3413f630a1012a47ba687f3a
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Apr 12 08:05:37 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Apr 12 08:05:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92670d8

sys-kernel/installkernel-gentoo: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/installkernel-gentoo/Manifest   |  2 --
 .../installkernel-gentoo-5.ebuild  | 39 --
 .../installkernel-gentoo-6.ebuild  | 39 --
 3 files changed, 80 deletions(-)

diff --git a/sys-kernel/installkernel-gentoo/Manifest 
b/sys-kernel/installkernel-gentoo/Manifest
index e0ccbeb6ee2b..94b553d659cd 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,3 +1 @@
-DIST installkernel-gentoo-5.tar.gz 2883 BLAKE2B 
a50c9b19e0e8bb12ee29dd5e98859d274355637e6bf0ce71863e4f93c346b14c117f952bf00c1d04d7e9dce068a3da8097a3464d28d6ea9ebcd3c9ec286a
 SHA512 
69fb04b2e445fb02515c05c6fd10f301e6c1c5dc479a399178205b7690e4fe066149353e9c4b16ece5112dc081c05493ebd85ecbe5c939e7c8f59fda1bf5e8f1
-DIST installkernel-gentoo-6.tar.gz 2907 BLAKE2B 
61c519779445fc62191cbb2ceff90def95c1958e76e9fa1024846977b74801c0122c3d0ec245ad1be4161c9fe4ed56bef77f24a2e136e66d2abb8b45a4497f7a
 SHA512 
a5ca2830db5ee076c1bb2cb320636b4c81f21270c62429d34a72cf1a933ecb4ef9abcb6d7929378eb26f63bc3093ad02a763bb51209652a35bb04495f8f3589f
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 
675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b
 SHA512 
9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-5.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-5.ebuild
deleted file mode 100644
index 28e60dda0e47..
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="https://github.com/mgorny/installkernel-gentoo;
-SRC_URI="https://github.com/mgorny/installkernel-gentoo/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="grub"
-
-RDEPEND="
-   >=sys-apps/debianutils-4.9-r1
-   !https://github.com/projg2/installkernel-gentoo;
-SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="grub"
-
-RDEPEND="
-   >=sys-apps/debianutils-4.9-r1
-   !

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

2023-04-12 Thread Sam James
commit: 8ad792bb2dce9e870483cb64645848ed47d53421
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 12 07:59:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 12 07:59:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad792bb

sys-kernel/installkernel-gentoo: Stabilize 7 amd64, #904184

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
index 46a6f7ca5ff2..3a1e960924ef 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
 
 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="grub"
 
 RDEPEND="



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

2023-04-12 Thread Sam James
commit: 7b5197000907d6d1a0d00fd89749cf06f72c955f
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 12 07:40:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 12 07:40:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b519700

sys-kernel/installkernel-gentoo: Stabilize 7 x86, #904184

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
index 69ef765b6a66..46a6f7ca5ff2 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
 
 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="grub"
 
 RDEPEND="



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

2023-04-11 Thread Sam James
commit: 0ffb469551123ceb4f7efc79c1205211b18111b4
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 12 03:22:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 12 03:22:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ffb4695

sys-kernel/installkernel-gentoo: Stabilize 7 ppc, #904184

Signed-off-by: Sam James  gentoo.org>

 sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild 
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
index 125ab408b04e..69ef765b6a66 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
 
 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="grub"
 
 RDEPEND="



  1   2   >