From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7B5C15838C for ; Fri, 19 Jan 2024 21:33:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3478E29CC; Fri, 19 Jan 2024 21:33:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAC7CE29CC for ; Fri, 19 Jan 2024 21:33:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A6AA34324A for ; Fri, 19 Jan 2024 21:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3E2FBE7 for ; Fri, 19 Jan 2024 21:33:48 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1705700013.bbd5f92e1c606a1f29923b47b203ff3121db3ee1.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/installkernel/Manifest sys-kernel/installkernel/installkernel-18.ebuild X-VCS-Directories: sys-kernel/installkernel/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: bbd5f92e1c606a1f29923b47b203ff3121db3ee1 X-VCS-Branch: master Date: Fri, 19 Jan 2024 21:33:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 06c8b8ad-b37f-4959-8b9b-2f5fce6b87c9 X-Archives-Hash: 67c6d06743c620817fb8b40a5e9f941f commit: bbd5f92e1c606a1f29923b47b203ff3121db3ee1 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Jan 19 21:32:49 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Jan 19 21:33:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd5f92e sys-kernel/installkernel: add 18 this version allows skipping of -systemd initrd/uki plugins at runtime Signed-off-by: Andrew Ammerlaan gentoo.org> sys-kernel/installkernel/Manifest | 1 + sys-kernel/installkernel/installkernel-18.ebuild | 114 +++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 1e354b8e2f95..03bed8876c0c 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,3 +1,4 @@ DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2 DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0 DIST installkernel-17.tar.gz 7109 BLAKE2B 1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216 SHA512 f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03 +DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686 diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild new file mode 100644 index 000000000000..0f0f4cb9259d --- /dev/null +++ b/sys-kernel/installkernel/installkernel-18.ebuild @@ -0,0 +1,114 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Gentoo fork of installkernel script from debianutils" +HOMEPAGE="https://github.com/projg2/installkernel-gentoo" +SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-gentoo-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="+dracut grub module-rebuild systemd uki ukify" + +RDEPEND=" + !<=sys-kernel/installkernel-systemd-3 + >=sys-apps/debianutils-4.9-r1 + dracut? ( >=sys-kernel/dracut-060_pre20240104 ) + grub? ( sys-boot/grub ) + systemd? ( + || ( + sys-apps/systemd[kernel-install(-)] + sys-apps/systemd-utils[kernel-install(-)] + ) + ) + ukify? ( + || ( + sys-apps/systemd[ukify(-)] + sys-apps/systemd-utils[ukify(-)] + ) + ) + !=sys-apps/systemd-255.2-r1 + !=sys-apps/systemd-255.2-r0 + !~sys-apps/systemd-255.1 + !~sys-apps/systemd-255.0 + !=sys-apps/systemd-254.8-r0 + !=sys-apps/systemd-254.7-r0 + !~sys-apps/systemd-254.6 + !<=sys-apps/systemd-254.5-r1 +" # Block against systemd that still installs dummy install.conf + +src_install() { + keepdir /etc/kernel/postinst.d + keepdir /etc/kernel/preinst.d + + exeinto /etc/kernel/preinst.d + use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install + use dracut && doexe hooks/50-dracut.install + use ukify && doexe hooks/60-ukify.install + + exeinto /etc/kernel/postinst.d + use uki && doexe hooks/90-uki-copy.install + use grub && doexe hooks/91-grub-mkconfig.install + + exeinto /usr/lib/kernel/install.d + doexe hooks/systemd/00-00machineid-directory.install + doexe hooks/systemd/10-copy-prebuilt.install + use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install + use grub && doexe hooks/systemd/91-grub-mkconfig.install + + if use systemd; then + sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel || + die "enabling systemd's kernel-install failed" + fi + + # set some default config using the flags we have anyway + touch "${T}/install.conf" || die + echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die + if use uki; then + echo "layout=uki" >> "${T}/install.conf" || die + elif use grub; then + echo "layout=grub" >> "${T}/install.conf" || die + else + echo "layout=bls" >> "${T}/install.conf" || die + fi + + if use dracut; then + echo "initrd_generator=dracut" >> "${T}/install.conf" || die + if ! use ukify; then + echo "uki_generator=dracut" >> "${T}/install.conf" || die + fi + else + echo "initrd_generator=none" >> "${T}/install.conf" || die + fi + + if use ukify; then + echo "uki_generator=ukify" >> "${T}/install.conf" || die + else + if ! use dracut; then + echo "uki_generator=none" >> "${T}/install.conf" || die + fi + fi + + insinto /usr/lib/kernel + doins "${T}/install.conf" + + into / + dosbin installkernel + doman installkernel.8 +} + +pkg_postinst() { + elog "Version 14 and up of ${PN} effectively merges" + elog "${PN}-gentoo and ${PN}-systemd." + elog "Switching between the traditional installkernel and systemd's" + elog "kernel-install is controlled with the systemd USE flag or the" + elog "SYSTEMD_KERNEL_INSTALL environment variable." + elog + elog "See the installkernel wiki page[1] for more details." + elog + elog "[1]: https://wiki.gentoo.org/wiki/Installkernel" +}