From 5939313f229e6fcf374fb7e9ee4f8675b05ab293 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Feb 2024 17:45:32 +0000 Subject: gentoo auto-resync : 02:02:2024 - 17:45:32 --- sys-kernel/installkernel/Manifest | 4 +- sys-kernel/installkernel/installkernel-23.ebuild | 147 ---------------------- sys-kernel/installkernel/installkernel-24.ebuild | 151 +++++++++++++++++++++++ 3 files changed, 153 insertions(+), 149 deletions(-) delete mode 100644 sys-kernel/installkernel/installkernel-23.ebuild create mode 100644 sys-kernel/installkernel/installkernel-24.ebuild (limited to 'sys-kernel/installkernel') diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 6e44c3502403..db67fab39197 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,5 +1,5 @@ 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 EBUILD installkernel-12.ebuild 1490 BLAKE2B 88956c7ff428beaf980b47d567fc1baaaee6dfbba3139e3a5b3d178d9119fef8d712862ee07933b8132d00b406419fcd873eb698a22cbe7329675788488db7d7 SHA512 78d9f9958c56bb47902d8cb894bbc9574c96fb2d986b00cb6b7bbe20b2db58db7c41a53f33794b98726870bac9a1b2c4a381bc4609288dcc0a05b87102aaac7d -EBUILD installkernel-23.ebuild 4468 BLAKE2B bf29ce2134eb1f85216fd4ccee7efce80ad2aa754fa6a4f2826120f887c9cfb22a90f790a01e188c73ea33f4137638b4fd424718e112bed7549add0407bb9ed3 SHA512 aa616f4426c54590812fb11c757444d8d6b73119724c9cbe5d8962241490a3031916fafeb3f95d991a6703d01740a9c6ac9733640f0ea08b5bc882930ba8c931 +EBUILD installkernel-24.ebuild 4578 BLAKE2B bea51d5983b74bee7e14b59d483010120bfcbb7cca3bbefb65495dfd799f86b278e45d2551ce1e5a4d7ebc7ceab5431a702453a6cea6a38213fa83baea3a5008 SHA512 8c26e47b1fb794856a6d6bdb2d3a2fdf0b9233057533219fa3332f0eb106077a2c9fcfb96a80904ffa59b177fcdab304a54e7cb0433f0b9ae7322209cad8a0a2 MISC metadata.xml 939 BLAKE2B fd8d6a7c19c2a5f6f11e60cdf0a5b9e98f140d80bbab835f5350ac6fb87e786fa5a93e3157e9affd45f381d4eb20c454775d703c8bdf82d2a6161e2ca2420ef9 SHA512 9d1b025cf8c5c0875015e0e9b3cadbec2ab3770aa76c8792adb8b16037dbcdcf3cb75d23d0dcaad7a932138bbdb524c266c1bf1cab09df9541a1acac45d7ca82 diff --git a/sys-kernel/installkernel/installkernel-23.ebuild b/sys-kernel/installkernel/installkernel-23.ebuild deleted file mode 100644 index 333ea4b45568..000000000000 --- a/sys-kernel/installkernel/installkernel-23.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Gentoo fork of installkernel script from debianutils" -HOMEPAGE=" - https://github.com/projg2/installkernel-gentoo - https://wiki.gentoo.org/wiki/Installkernel -" -SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-gentoo-${PV}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="dracut grub systemd systemd-boot uki ukify" -REQUIRED_USE="systemd-boot? ( systemd )" - -RDEPEND=" - !<=sys-kernel/installkernel-systemd-3 - dracut? ( >=sys-kernel/dracut-060_pre20240104 ) - grub? ( sys-boot/grub ) - systemd? ( - || ( - sys-apps/systemd[kernel-install(-)] - sys-apps/systemd-utils[kernel-install(-)] - ) - ) - systemd-boot? ( - || ( - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot(-)] - ) - ) - ukify? ( - || ( - sys-apps/systemd[ukify(-)] - sys-apps/systemd-utils[ukify(-)] - ) - ) - !=sys-apps/systemd-255.2-r1 - !=sys-apps/systemd-255.2-r0 - !~sys-apps/systemd-255.1 - !~sys-apps/systemd-255.0 - !=sys-apps/systemd-254.8-r0 - !=sys-apps/systemd-254.7-r0 - !~sys-apps/systemd-254.6 - !<=sys-apps/systemd-254.5-r1 -" # Block against systemd that still installs dummy install.conf - -src_install() { - keepdir /etc/kernel/postinst.d - keepdir /etc/kernel/preinst.d - - exeinto /etc/kernel/preinst.d - use dracut && doexe hooks/50-dracut.install - use ukify && doexe hooks/60-ukify.install - - exeinto /etc/kernel/postinst.d - use uki && doexe hooks/90-uki-copy.install - use grub && doexe hooks/91-grub-mkconfig.install - - exeinto /usr/lib/kernel/install.d - doexe hooks/systemd/00-00machineid-directory.install - doexe hooks/systemd/10-copy-prebuilt.install - doexe hooks/systemd/90-compat.install - doexe hooks/systemd/91-grub-mkconfig.install - - if use systemd; then - sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel || - die "enabling systemd's kernel-install failed" - fi - - # set some default config using the flags we have anyway - touch "${T}/install.conf" || die - echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die - if use uki; then - echo "layout=uki" >> "${T}/install.conf" || die - elif use systemd-boot; then - echo "layout=bls" >> "${T}/install.conf" || die - elif use grub; then - echo "layout=grub" >> "${T}/install.conf" || die - else - echo "layout=compat" >> "${T}/install.conf" || die - fi - - if use dracut; then - echo "initrd_generator=dracut" >> "${T}/install.conf" || die - if ! use ukify; then - echo "uki_generator=dracut" >> "${T}/install.conf" || die - fi - else - echo "initrd_generator=none" >> "${T}/install.conf" || die - fi - - if use ukify; then - echo "uki_generator=ukify" >> "${T}/install.conf" || die - else - if ! use dracut; then - echo "uki_generator=none" >> "${T}/install.conf" || die - fi - fi - - insinto /usr/lib/kernel - doins "${T}/install.conf" - - into / - dosbin installkernel - doman installkernel.8 - - einstalldocs -} - -pkg_postinst() { - # show only when upgrading to 14+ - if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then - elog "Version 14 and up of ${PN} effectively merges" - elog "${PN}-gentoo and ${PN}-systemd." - elog "Switching between the traditional installkernel and systemd's" - elog "kernel-install is controlled with the systemd USE flag or the" - elog "SYSTEMD_KERNEL_INSTALL environment variable." - elog - elog "See the installkernel wiki page[1] for more details." - elog - elog "[1]: https://wiki.gentoo.org/wiki/Installkernel" - elog - fi - - # show only on first install of version 20+ - if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then - if has_version "sys-boot/grub" && ! use grub; then - elog "sys-boot/grub is installed but the grub USE flag is not enabled." - elog "Users may want to enable this flag to automatically update the" - elog "bootloader configuration on each kernel install." - fi - if ( has_version "sys-apps/systemd[boot]" || - has_version "sys-apps/systemd-utils[boot]" ) && - ! use systemd-boot; then - elog "systemd-boot is installed but the systemd-boot USE flag" - elog "is not enabled. Users should enable this flag to install kernels" - elog "in a layout that systemd-boot understands and to automatically" - elog "update systemd-boot's configuration on each kernel install." - fi - fi -} diff --git a/sys-kernel/installkernel/installkernel-24.ebuild b/sys-kernel/installkernel/installkernel-24.ebuild new file mode 100644 index 000000000000..e825c472c126 --- /dev/null +++ b/sys-kernel/installkernel/installkernel-24.ebuild @@ -0,0 +1,151 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Gentoo fork of installkernel script from debianutils" +HOMEPAGE=" + https://github.com/projg2/installkernel-gentoo + https://wiki.gentoo.org/wiki/Installkernel +" +SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-gentoo-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" +IUSE="dracut grub systemd systemd-boot uki ukify" +REQUIRED_USE="systemd-boot? ( systemd )" + +RDEPEND=" + !<=sys-kernel/installkernel-systemd-3 + dracut? ( >=sys-kernel/dracut-060_pre20240104-r1 ) + grub? ( sys-boot/grub ) + systemd? ( + || ( + sys-apps/systemd[kernel-install(-)] + sys-apps/systemd-utils[kernel-install(-)] + ) + ) + systemd-boot? ( + || ( + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot(-)] + ) + ) + ukify? ( + || ( + sys-apps/systemd[ukify(-)] + sys-apps/systemd-utils[ukify(-)] + ) + ) + !=sys-apps/systemd-255.2-r1 + !=sys-apps/systemd-255.2-r0 + !~sys-apps/systemd-255.1 + !~sys-apps/systemd-255.0 + !=sys-apps/systemd-254.8-r0 + !=sys-apps/systemd-254.7-r0 + !~sys-apps/systemd-254.6 + !<=sys-apps/systemd-254.5-r1 +" # Block against systemd that still installs dummy install.conf + +src_install() { + keepdir /etc/kernel/postinst.d + keepdir /etc/kernel/preinst.d + + exeinto /etc/kernel/preinst.d + use dracut && doexe hooks/50-dracut.install + use ukify && doexe hooks/60-ukify.install + + exeinto /etc/kernel/postinst.d + use uki && doexe hooks/90-uki-copy.install + use grub && doexe hooks/91-grub-mkconfig.install + + exeinto /usr/lib/kernel/install.d + doexe hooks/systemd/00-00machineid-directory.install + doexe hooks/systemd/10-copy-prebuilt.install + doexe hooks/systemd/90-compat.install + use grub && doexe hooks/systemd/91-grub-mkconfig.install + + if use systemd; then + sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel || + die "enabling systemd's kernel-install failed" + fi + + # set some default config using the flags we have anyway + touch "${T}/install.conf" || die + echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die + if use uki; then + echo "layout=uki" >> "${T}/install.conf" || die + elif use systemd-boot; then + echo "layout=bls" >> "${T}/install.conf" || die + elif use grub; then + echo "layout=grub" >> "${T}/install.conf" || die + else + echo "layout=compat" >> "${T}/install.conf" || die + fi + + if use dracut; then + echo "initrd_generator=dracut" >> "${T}/install.conf" || die + if ! use ukify; then + if use uki; then + echo "uki_generator=dracut" >> "${T}/install.conf" || die + else + echo "uki_generator=none" >> "${T}/install.conf" || die + fi + fi + else + echo "initrd_generator=none" >> "${T}/install.conf" || die + fi + + if use ukify; then + echo "uki_generator=ukify" >> "${T}/install.conf" || die + else + if ! use dracut; then + echo "uki_generator=none" >> "${T}/install.conf" || die + fi + fi + + insinto /usr/lib/kernel + doins "${T}/install.conf" + + into / + dosbin installkernel + doman installkernel.8 + + einstalldocs +} + +pkg_postinst() { + # show only when upgrading to 14+ + if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then + elog "Version 14 and up of ${PN} effectively merges" + elog "${PN}-gentoo and ${PN}-systemd." + elog "Switching between the traditional installkernel and systemd's" + elog "kernel-install is controlled with the systemd USE flag or the" + elog "SYSTEMD_KERNEL_INSTALL environment variable." + elog + elog "See the installkernel wiki page[1] for more details." + elog + elog "[1]: https://wiki.gentoo.org/wiki/Installkernel" + elog + fi + + # show only on first install of version 20+ + if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then + if has_version "sys-boot/grub" && ! use grub; then + elog "sys-boot/grub is installed but the grub USE flag is not enabled." + elog "Users may want to enable this flag to automatically update the" + elog "bootloader configuration on each kernel install." + fi + if ( has_version "sys-apps/systemd[boot]" || + has_version "sys-apps/systemd-utils[boot]" ) && + ! use systemd-boot; then + elog "systemd-boot is installed but the systemd-boot USE flag" + elog "is not enabled. Users should enable this flag to install kernels" + elog "in a layout that systemd-boot understands and to automatically" + elog "update systemd-boot's configuration on each kernel install." + fi + fi +} -- cgit v1.2.3