From 7860ad41012a3808c645607818b64ad7dab025e9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jan 2024 13:10:51 +0000 Subject: gentoo auto-resync : 13:01:2024 - 13:10:51 --- sys-kernel/installkernel/Manifest | 4 +- .../installkernel/installkernel-14-r2.ebuild | 101 ------------------ sys-kernel/installkernel/installkernel-15.ebuild | 113 +++++++++++++++++++++ 3 files changed, 115 insertions(+), 103 deletions(-) delete mode 100644 sys-kernel/installkernel/installkernel-14-r2.ebuild create mode 100644 sys-kernel/installkernel/installkernel-15.ebuild (limited to 'sys-kernel/installkernel') diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 65878d1b3fa2..c0d1973efb1d 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-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66 +DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0 EBUILD installkernel-12.ebuild 1444 BLAKE2B 7ef1f8e8205cf742b2304e8232f7f017245a21ab5ff6723b677e4dd810dfd46977632b0c0e3cb5ce66523206cec4cfd539829bbe467838e4b65f6fb51a56d2ec SHA512 a7d72bd6ebb3b42d3348253756caaf169d0dce9c92403c3ccec5486f470d60e5d681299bfa3d9f41c6bab2dca35d958adf9663562c3e30282a66e78dfd39f53e -EBUILD installkernel-14-r2.ebuild 2379 BLAKE2B a7baa20d238e534797acda33cd27f45cecce968ecf9caedd216d467e5a3c3e38797ab547a7300e640d626c8f9ec9315cd98480f87312ae3cbccf4fd26e7ce9dd SHA512 16cbac01ffcc3f112cbc4391f51a9bfafa85265cc338ea5d9e57d9ffd6e3fbdec5eb260d02c212db17198dc178ea38f98cc263fbe94e43745280ee55ca210ba9 +EBUILD installkernel-15.ebuild 2829 BLAKE2B dad8194652a40423d278a6b8890a9bd41a2a4e8942bbbb092467e13844471c03f811103165213664a26e6932de4f1c6c6bc55b47352532a003b8497eb92d27be SHA512 c40f0cbf434d93140c7f94b9918ca2b57e3d08e099dfa66b28b4a17f609136aa1d1338cfd2ecba55874c0c6938c7880e3ac91a609b98f36ac2cddc68a295c098 MISC metadata.xml 861 BLAKE2B b5526c0440f51568a5afd3f5c8f8d862b29713d5c8b20fbb3388cadf1bd48bf1897fa7e5c2561ad589a97eac5df7f0c6aa8f38a71226c34b422e70ec81b32a8b SHA512 128b33f9aa08247e1733640449b5ae89be093473d78464d1eea9280e2cfaf22d0b91450660590f2ee6dec8c9987f7b9bf4520ad6492f1feabc89eee308d46061 diff --git a/sys-kernel/installkernel/installkernel-14-r2.ebuild b/sys-kernel/installkernel/installkernel-14-r2.ebuild deleted file mode 100644 index 05307034f5e5..000000000000 --- a/sys-kernel/installkernel/installkernel-14-r2.ebuild +++ /dev/null @@ -1,101 +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-apps/debianutils-4.9-r1 - dracut? ( >=sys-kernel/dracut-059-r4 ) - systemd? ( - || ( - sys-apps/systemd[kernel-install(-)] - sys-apps/systemd-utils[kernel-install(-)] - ) - ) - ukify? ( - || ( - sys-apps/systemd[ukify(-)] - sys-apps/systemd-utils[ukify(-)] - ) - ) -" - -src_install() { - keepdir /etc/kernel/postinst.d - keepdir /etc/kernel/preinst.d - - if use dracut; then - exeinto /etc/kernel/preinst.d - doexe hooks/50-dracut.install - fi - - if use grub; then - exeinto /etc/kernel/postinst.d - doexe hooks/91-grub-mkconfig.install - fi - - if use uki; then - exeinto /etc/kernel/postinst.d - doexe hooks/90-uki-copy.install - fi - - if use ukify; then - exeinto /etc/kernel/preinst.d - doexe hooks/60-ukify.install - fi - - if use systemd; then - sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel || - die "enabling systemd's kernel-install failed" - fi - - # set some default config using the flags we have anyway - touch "${T}/install.conf" || die - if use uki; then - echo "layout=uki" >> "${T}/install.conf" || die - elif use grub; then - echo "layout=grub" >> "${T}/install.conf" || die - else - echo "layout=bls" >> "${T}/install.conf" || die - fi - - if use dracut; then - echo "initrd_generator=dracut" >> "${T}/install.conf" || die - if ! use ukify; then - echo "uki_generator=dracut" >> "${T}/install.conf" || die - fi - else - echo "initrd_generator=none" >> "${T}/install.conf" || die - fi - - if use ukify; then - echo "uki_generator=ukify" >> "${T}/install.conf" || die - else - if ! use dracut; then - echo "uki_generator=none" >> "${T}/install.conf" || die - fi - fi - - if [[ -s "${T}/install.conf" ]]; then - insinto /etc/kernel - doins "${T}/install.conf" - fi - - exeinto /usr/lib/kernel/install.d - doexe hooks/systemd/*.install - - into / - dosbin installkernel - doman installkernel.8 -} diff --git a/sys-kernel/installkernel/installkernel-15.ebuild b/sys-kernel/installkernel/installkernel-15.ebuild new file mode 100644 index 000000000000..99a5eec37735 --- /dev/null +++ b/sys-kernel/installkernel/installkernel-15.ebuild @@ -0,0 +1,113 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Gentoo fork of installkernel script from debianutils" +HOMEPAGE="https://github.com/projg2/installkernel-gentoo" +SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-gentoo-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="+dracut grub systemd uki ukify" + +RDEPEND=" + !<=sys-kernel/installkernel-systemd-3 + >=sys-apps/debianutils-4.9-r1 + dracut? ( >=sys-kernel/dracut-059-r4 ) + grub? ( sys-boot/grub ) + systemd? ( + || ( + sys-apps/systemd[kernel-install(-)] + sys-apps/systemd-utils[kernel-install(-)] + ) + ) + ukify? ( + || ( + sys-apps/systemd[ukify(-)] + sys-apps/systemd-utils[ukify(-)] + ) + ) +" + +src_install() { + keepdir /etc/kernel/postinst.d + keepdir /etc/kernel/preinst.d + + if use dracut; then + exeinto /etc/kernel/preinst.d + doexe hooks/50-dracut.install + fi + + if use grub; then + exeinto /etc/kernel/postinst.d + doexe hooks/91-grub-mkconfig.install + fi + + if use uki; then + exeinto /etc/kernel/postinst.d + doexe hooks/90-uki-copy.install + fi + + if use ukify; then + exeinto /etc/kernel/preinst.d + doexe hooks/60-ukify.install + fi + + if use systemd; then + sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel || + die "enabling systemd's kernel-install failed" + fi + + # set some default config using the flags we have anyway + touch "${T}/install.conf" || die + if use uki; then + echo "layout=uki" >> "${T}/install.conf" || die + elif use grub; then + echo "layout=grub" >> "${T}/install.conf" || die + else + echo "layout=bls" >> "${T}/install.conf" || die + fi + + if use dracut; then + echo "initrd_generator=dracut" >> "${T}/install.conf" || die + if ! use ukify; then + echo "uki_generator=dracut" >> "${T}/install.conf" || die + fi + else + echo "initrd_generator=none" >> "${T}/install.conf" || die + fi + + if use ukify; then + echo "uki_generator=ukify" >> "${T}/install.conf" || die + else + if ! use dracut; then + echo "uki_generator=none" >> "${T}/install.conf" || die + fi + fi + + insinto /etc/kernel + doins "${T}/install.conf" + + exeinto /usr/lib/kernel/install.d + doexe hooks/systemd/*.install + + into / + dosbin installkernel + doman installkernel.8 +} + +pkg_postinst() { + elog "Version 14 and up of ${PN} effectively merges" + elog "${PN}-gentoo and ${PN}-systemd." + elog "Switching between the traditional installkernel and systemd's" + elog "kernel-install is controlled with the systemd USE flag or the" + elog "SYSTEMD_KERNEL_INSTALL environment variable." + elog + elog "See the installkernel wiki page[1] for more details." + elog + elog "https://wiki.gentoo.org/wiki/Installkernel" +} -- cgit v1.2.3