gentoo auto-resync : 21:12:2023 - 13:58:21

4 files changed, 62 insertions, 0 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 143fe6956e81..ad16ef2dfb3d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/installkernel-systemd/Manifest b/sys-kernel/installkernel-systemd/Manifest
index 6ab0257de681..951af705efda 100644
--- a/sys-kernel/installkernel-systemd/Manifest
+++ b/sys-kernel/installkernel-systemd/Manifest
@@ -1,4 +1,6 @@
 AUX installkernel-systemd-2-r2-00-00machineid-directory.install 732 BLAKE2B eb0d08c8d266cf57e35a618ca0f87b25ea59df5a9ea11bcb076d4a9e4c269a9a60040493d61ea8e39f785d3bfb8c4920dfc738112960570b4682f1bb7e33ce8a SHA512 01dfa27c76b23d6ddec354118b2573eb244bd11b1a626f3cf6fcc205f0c6bd11c11f518e8460de16c83d9074ed759ba2251ed892cbadac17784e611a64cb404e
+AUX installkernel-systemd-3-10-copy-prebuilt.install 542 BLAKE2B 687fd634ef84d86dce82fb69e443cb0288de018305467ef6adc636a7fbeacd7b028554208ce0f542e37465ab1c879bec9baa99f194eb45ab7b55241a26b4b13b SHA512 6a726be2c6a293f2786dd239a5547535f78ce3ce34edb37d166a603593e8ffc50d42b1258d37a84f325c2e43d988a449d8eeeada7e2ba6becad6cdd1f9a0e856
 EBUILD installkernel-systemd-2-r4.ebuild 954 BLAKE2B 4f1d14062b56663b79d71a47ff4f5d58dc719c697a6febb668494a0dac0c43f3315a30d1e91364146258a85049ac058d1fde6d4b18e34945c5f9e538a9140d41 SHA512 b7a5204ea1014bb3ea2f549ccc787a9807bb204a6fc26af25f169f62f5c52be067ed8d074cd7d719d6dde02d0ded4abd94c6e4f1d978fda8f63355cb7fb76d30
 EBUILD installkernel-systemd-2-r5.ebuild 920 BLAKE2B b74a90d35ee526e34dfe34b21308b5046db03be263768f0dcb2b61dd1ba300dd61f3b18cae453ba17e65d115f65984757116d4c68ce7e9bb5f6ac3dc545e1a67 SHA512 c6ea5589122d3e622a776feeac10d752327e990bcde4f848a81ddeedcb73a54b4813a15b5ee5585e455918f1a11c224a7d51399d9efa550cba2c49f3efd8af46
+EBUILD installkernel-systemd-3.ebuild 1008 BLAKE2B 286f523c11a91954c1dcdf77c4f855aa345bc255281165fa9c6437981bdc29b6bcc6077dce3f247e9620e6850641a355bbcbeec277e6e73af8df133d8be63313 SHA512 cf1d806fba4192ec37d3ac32b74221e56f021a857641fa406693d2d243d5269fc79a4f34306b0082ec8ce6babb771241b4d40fca9e3acf82fe6298062a58f55d
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install b/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
new file mode 100644
index 000000000000..56f4641d9664
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+
+# this file is installed by sys-kernel/installkernel-systemd
+
+COMMAND="${1}"
+KERNEL_IMAGE="${4}"
+
+if [ "${COMMAND}" != "add" ]; then
+	exit 0
+fi
+
+IMAGE_DIR="$(dirname ${KERNEL_IMAGE})"
+INITRD=${IMAGE_DIR}/initrd
+UKI=${IMAGE_DIR}/uki.efi
+
+if [ -f "${INITRD}" ]; then
+	echo "Copying prebuilt initramfs to staging area"
+	cp "${INITRD}" "${KERNEL_INSTALL_STAGING_AREA}/initrd" || exit 1
+fi
+
+if [ -f "${UKI}" ]; then
+	echo "Copying prebuilt UKI to staging area"
+	cp "${UKI}" "${KERNEL_INSTALL_STAGING_AREA}/uki.efi" || exit 1
+fi
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
new file mode 100644
index 000000000000..f5c22ec7a318
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	!sys-kernel/installkernel-gentoo
+	|| (
+		sys-apps/systemd[kernel-install(-)]
+		sys-apps/systemd-utils[kernel-install(-)]
+	)
+"
+
+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}" --verbose
+	EOF
+
+	exeinto /usr/lib/kernel/install.d/
+	newexe "${FILESDIR}/${PN}-2-r2-00-00machineid-directory.install" \
+		00-00machineid-directory.install
+	newexe "${FILESDIR}/${PN}-3-10-copy-prebuilt.install" \
+		10-copy-prebuilt.install
+}