gentoo auto-resync : 22:06:2023 - 13:21:57

4 files changed, 68 insertions, 0 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 8a77aee5fe28..f57084b6a2bd 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/installkernel-systemd-boot/Manifest b/sys-kernel/installkernel-systemd-boot/Manifest
index cc1cbf1735ce..80259644e9f4 100644
--- a/sys-kernel/installkernel-systemd-boot/Manifest
+++ b/sys-kernel/installkernel-systemd-boot/Manifest
@@ -1,3 +1,5 @@
 AUX 00-00machineid-directory.install 694 BLAKE2B d4347645fb0a6401fc2b3ed43dac6c925591c289484a1946be137045066e5064d6df0aa9d547c1b720683434636b16a6a182c7b1ba18faf9733ce984e4a5b4b0 SHA512 f8af2f19a605b59f54662dfa909254de4fe2f4f5334d7bce7c6c5babb8e78382b6497a4a28d6d34b5c27af3f5b5b55772d0a1b8ade98cb63eb5d9266e7b9067e
+AUX installkernel-systemd-boot-2-r2-00-00machineid-directory.install 737 BLAKE2B cc4c2d2cf91de01f42242ce995c79afbb23deb942265ad0a57490260a22b1fc1aac5d85221f03fe93f3d337fbe36e69e3c57b13ec7d90129aa4d4c6949167cad SHA512 427363db8acded018621b23d97b64cbe897ffc08b75dc3f1aa669b24907f6bce7cc8978614f9327dbc125ae0184c84abf8087a08fcbf19651a0c6f9bbb4cd6e9
 EBUILD installkernel-systemd-boot-2-r1.ebuild 811 BLAKE2B 650427828e062194127b4ae6b9a5a5748fdd1965673580bffc8e63429a8d6a694177bd08851def3179059e33c85f076fd188cf1b5c514304e4e7b793a028a5c2 SHA512 532b7751a0d246c205140fb204ef38b27d7fba63472d3dab3760fab7bdc2d965998d7c0d5243affd70a51cd2a5de1328a212cbb3c52bf7db64df2092ed30f9b6
+EBUILD installkernel-systemd-boot-2-r2.ebuild 820 BLAKE2B 6d67fbcea4cb9cfba0a2a84af06d2b5145d91e1c81d4bae61453f7422a69114fdaa98d1434ab8b9da976c67cb4cfa3a47a0a8e6d4132be17b918292a768ef547 SHA512 c11fea228d8a92391156a9e21ae01de2a7681357137cc4eea91ef637652498606e0167b4b7e7889d7687c84a1daa7166d28e50aefca8940c3e536d03cf92d038
 MISC metadata.xml 267 BLAKE2B 4449a3159ae97fc4f2152d9305dc77bf8df18a3dc3ae5881b9e56fc0a30da17d7dabf24901b421389b0cea4b7f0037f46e193d8a74a79431c1ccbd3db1fde9ea SHA512 54190f2ef340d1e355087b7a9af6f651be3704bbf23600f024eabb1bdffd36fd92c1f3f37b409dbde82f52b5287e08a427537ca1028bc326d19470f755cefd43
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 000000000000..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/<machine-id>)
+# 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 000000000000..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
+}