public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
Date: Thu, 22 Feb 2024 13:08:37 +0000 (UTC)	[thread overview]
Message-ID: <1708607288.98a8afa16a76ac319a85b4e700d236659b486f22.andrewammerlaan@gentoo> (raw)

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

sys-kernel/installkernel: add 26

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-kernel/installkernel/Manifest                |   1 +
 sys-kernel/installkernel/installkernel-26.ebuild | 162 +++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index bc0bbc284b54..98c7637afdfb 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,4 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
 DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
 DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
+DIST installkernel-26.tar.gz 18632 BLAKE2B 35fafbfcdb6eb2b6d2f75f2beb03839f4ed6838f7643d01aebb8e09eaf07f2349eaa290c68ca0852658e026fdc597c33ee443e7acc44f27f386da8709145d16d SHA512 ec96c4780ef5352b544b590cc6fdce5fb396bcf7c2d738c2c93dd19f20ea7003c4944340cb03ebdb9ac679c9ac81601d9739ef26ccd7b07ed7684a44f100aa75

diff --git a/sys-kernel/installkernel/installkernel-26.ebuild b/sys-kernel/installkernel/installkernel-26.ebuild
new file mode 100644
index 000000000000..e42ed6004810
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-26.ebuild
@@ -0,0 +1,162 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="
+	https://github.com/projg2/installkernel-gentoo
+	https://wiki.gentoo.org/wiki/Installkernel
+"
+SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-gentoo-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="dracut grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
+
+RDEPEND="
+	!<=sys-kernel/installkernel-systemd-3
+	dracut? (
+		>=sys-kernel/dracut-060_pre20240104-r1
+		uki? (
+			|| (
+				sys-apps/systemd[boot(-)]
+				sys-apps/systemd-utils[boot(-)]
+			)
+		)
+	)
+	grub? ( sys-boot/grub )
+	refind? ( sys-boot/refind )
+	systemd? (
+		|| (
+			sys-apps/systemd[kernel-install(-)]
+			sys-apps/systemd-utils[kernel-install(-)]
+		)
+	)
+	systemd-boot? (
+		|| (
+			sys-apps/systemd[boot(-)]
+			sys-apps/systemd-utils[boot(-)]
+		)
+	)
+	ukify? (
+		|| (
+			sys-apps/systemd[boot(-),ukify(-)]
+			sys-apps/systemd-utils[boot(-),ukify(-)]
+		)
+	)
+	!=sys-apps/systemd-255.2-r1
+	!=sys-apps/systemd-255.2-r0
+	!~sys-apps/systemd-255.1
+	!~sys-apps/systemd-255.0
+	!=sys-apps/systemd-254.8-r0
+	!=sys-apps/systemd-254.7-r0
+	!~sys-apps/systemd-254.6
+	!<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+	keepdir /etc/kernel/postinst.d
+	keepdir /etc/kernel/preinst.d
+
+	exeinto /usr/lib/kernel/preinst.d
+	use dracut && doexe hooks/50-dracut.install
+	use ukify && doexe hooks/60-ukify.install
+
+	exeinto /usr/lib/kernel/postinst.d
+	use uki && doexe hooks/90-uki-copy.install
+	use grub && doexe hooks/91-grub-mkconfig.install
+	use refind && doexe hooks/95-refind-copy-icon.install
+
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/systemd/00-00machineid-directory.install
+	doexe hooks/systemd/10-copy-prebuilt.install
+	doexe hooks/systemd/90-compat.install
+	use grub && doexe hooks/systemd/91-grub-mkconfig.install
+	use refind && doexe hooks/systemd/95-refind-copy-icon.install
+
+	if use systemd; then
+		sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+			die "enabling systemd's kernel-install failed"
+	fi
+
+	# set some default config using the flags we have anyway
+	touch "${T}/install.conf" || die
+	echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
+	if use uki; then
+		echo "layout=uki" >> "${T}/install.conf" || die
+	elif use systemd-boot; then
+		echo "layout=bls" >> "${T}/install.conf" || die
+	elif use grub; then
+		echo "layout=grub" >> "${T}/install.conf" || die
+	else
+		echo "layout=compat" >> "${T}/install.conf" || die
+	fi
+
+	if use dracut; then
+		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+		if ! use ukify; then
+			if use uki; then
+				echo "uki_generator=dracut" >> "${T}/install.conf" || die
+			else
+				echo "uki_generator=none" >> "${T}/install.conf" || die
+			fi
+		fi
+	else
+		echo "initrd_generator=none" >> "${T}/install.conf" || die
+	fi
+
+	if use ukify; then
+		echo "uki_generator=ukify" >> "${T}/install.conf" || die
+	else
+		if ! use dracut; then
+			echo "uki_generator=none" >> "${T}/install.conf" || die
+		fi
+	fi
+
+	insinto /usr/lib/kernel
+	doins "${T}/install.conf"
+
+	into /
+	dosbin installkernel
+	doman installkernel.8
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# show only when upgrading to 14+
+	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+		elog "Version 14 and up of ${PN} effectively merges"
+		elog "${PN}-gentoo and ${PN}-systemd."
+		elog "Switching between the traditional installkernel and systemd's"
+		elog "kernel-install is controlled with the systemd USE flag or the"
+		elog "SYSTEMD_KERNEL_INSTALL environment variable."
+		elog
+		elog "See the installkernel wiki page[1] for more details."
+		elog
+		elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+		elog
+	fi
+
+	# show only on first install of version 20+
+	if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+		if has_version "sys-boot/grub" && ! use grub; then
+			elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+			elog "Users may want to enable this flag to automatically update the"
+			elog "bootloader configuration on each kernel install."
+		fi
+		if ( has_version "sys-apps/systemd[boot]" ||
+			has_version "sys-apps/systemd-utils[boot]" ) &&
+			! use systemd-boot; then
+				elog "systemd-boot is installed but the systemd-boot USE flag"
+				elog "is not enabled. Users should enable this flag to install kernels"
+				elog "in a layout that systemd-boot understands and to automatically"
+				elog "update systemd-boot's configuration on each kernel install."
+		fi
+	fi
+}


             reply	other threads:[~2024-02-22 13:08 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22 13:08 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-18 17:37 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ Nowa Ammerlaan
2025-08-16 19:22 Nowa Ammerlaan
2025-08-16 19:22 Nowa Ammerlaan
2025-08-04 18:41 Nowa Ammerlaan
2025-08-04 18:41 Nowa Ammerlaan
2025-07-04  6:39 Nowa Ammerlaan
2025-07-04  6:39 Nowa Ammerlaan
2025-05-14 13:07 Nowa Ammerlaan
2025-05-14 13:07 Nowa Ammerlaan
2025-05-04 14:39 Nowa Ammerlaan
2025-05-04 14:39 Nowa Ammerlaan
2025-04-18 13:14 Nowa Ammerlaan
2025-03-01 19:30 Nowa Ammerlaan
2025-02-28 18:05 Nowa Ammerlaan
2025-02-22 20:19 Nowa Ammerlaan
2025-02-22 20:19 Nowa Ammerlaan
2025-02-20 10:56 Nowa Ammerlaan
2025-02-19 17:04 Nowa Ammerlaan
2025-02-19 17:04 Nowa Ammerlaan
2025-02-04 19:31 Nowa Ammerlaan
2025-02-03 17:40 Nowa Ammerlaan
2025-01-30 11:35 Nowa Ammerlaan
2025-01-30 11:35 Nowa Ammerlaan
2024-12-30 10:19 Nowa Ammerlaan
2024-12-29 18:51 Nowa Ammerlaan
2024-12-29 17:33 Nowa Ammerlaan
2024-10-24 14:54 Andrew Ammerlaan
2024-09-05  7:46 Andrew Ammerlaan
2024-09-05  7:46 Andrew Ammerlaan
2024-08-05 14:58 Andrew Ammerlaan
2024-08-05 14:28 Andrew Ammerlaan
2024-08-05 14:28 Andrew Ammerlaan
2024-08-03 15:59 Andrew Ammerlaan
2024-08-03 15:59 Andrew Ammerlaan
2024-08-03  9:21 Andrew Ammerlaan
2024-08-03  9:21 Andrew Ammerlaan
2024-08-03  7:37 Andrew Ammerlaan
2024-08-03  7:37 Andrew Ammerlaan
2024-07-31  7:21 Andrew Ammerlaan
2024-07-31  7:21 Andrew Ammerlaan
2024-07-30 18:25 Andrew Ammerlaan
2024-07-30 18:24 Andrew Ammerlaan
2024-07-30 17:55 Andrew Ammerlaan
2024-07-26 20:36 Andrew Ammerlaan
2024-07-25 12:16 Andrew Ammerlaan
2024-07-15 19:18 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-06-07 12:48 Andrew Ammerlaan
2024-06-07 12:48 Andrew Ammerlaan
2024-06-03 17:59 Andrew Ammerlaan
2024-05-07 15:57 Andrew Ammerlaan
2024-05-07 15:57 Andrew Ammerlaan
2024-04-24 10:13 Andrew Ammerlaan
2024-04-24 10:13 Andrew Ammerlaan
2024-04-13 15:19 Andrew Ammerlaan
2024-04-13 15:19 Andrew Ammerlaan
2024-04-12 10:39 Andrew Ammerlaan
2024-04-09 16:16 Andrew Ammerlaan
2024-04-09  9:59 Andrew Ammerlaan
2024-04-09  9:59 Andrew Ammerlaan
2024-03-22 21:40 Andrew Ammerlaan
2024-03-22 21:40 Andrew Ammerlaan
2024-03-20 18:30 Andrew Ammerlaan
2024-03-20 18:30 Andrew Ammerlaan
2024-03-19 15:47 Andrew Ammerlaan
2024-03-19 15:47 Andrew Ammerlaan
2024-03-08 16:06 Andrew Ammerlaan
2024-03-08 16:06 Andrew Ammerlaan
2024-02-24  6:28 Andrew Ammerlaan
2024-02-24  2:44 Ionen Wolkens
2024-02-23 14:59 Andrew Ammerlaan
2024-02-23 14:59 Andrew Ammerlaan
2024-02-23 13:02 Andrew Ammerlaan
2024-02-09 12:51 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-02-02  6:28 Andrew Ammerlaan
2024-02-02  6:28 Andrew Ammerlaan
2024-01-29  8:48 Andrew Ammerlaan
2024-01-29  8:48 Andrew Ammerlaan
2024-01-27 21:08 Andrew Ammerlaan
2024-01-25 12:03 Andrew Ammerlaan
2024-01-25  1:37 Sam James
2024-01-24 14:44 Andrew Ammerlaan
2024-01-24 14:39 Andrew Ammerlaan
2024-01-24 14:35 Andrew Ammerlaan
2024-01-24 13:37 Sam James
2024-01-24 10:59 Sam James
2024-01-24 10:58 Sam James
2024-01-24 10:58 Sam James
2024-01-24 10:58 Sam James
2024-01-19 21:33 Andrew Ammerlaan
2024-01-19 10:57 Andrew Ammerlaan
2024-01-19 10:57 Andrew Ammerlaan
2024-01-18 10:22 Andrew Ammerlaan
2024-01-17 20:52 Andrew Ammerlaan
2024-01-13 14:56 Andrew Ammerlaan
2024-01-13  7:45 Andrew Ammerlaan
2024-01-13  7:45 Andrew Ammerlaan
2024-01-13  6:49 Andrew Ammerlaan
2024-01-12 11:45 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708607288.98a8afa16a76ac319a85b4e700d236659b486f22.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox