gentoo resync : 29.06.2021

3 files changed, 59 insertions, 0 deletions

diff --git a/sys-kernel/installkernel-systemd-boot/Manifest b/sys-kernel/installkernel-systemd-boot/Manifest
index 68064d7e5aac..5f8cf3533204 100644
--- a/sys-kernel/installkernel-systemd-boot/Manifest
+++ b/sys-kernel/installkernel-systemd-boot/Manifest
@@ -1,2 +1,4 @@
+AUX 00-00machineid-directory.install 694 BLAKE2B d4347645fb0a6401fc2b3ed43dac6c925591c289484a1946be137045066e5064d6df0aa9d547c1b720683434636b16a6a182c7b1ba18faf9733ce984e4a5b4b0 SHA512 f8af2f19a605b59f54662dfa909254de4fe2f4f5334d7bce7c6c5babb8e78382b6497a4a28d6d34b5c27af3f5b5b55772d0a1b8ade98cb63eb5d9266e7b9067e
 EBUILD installkernel-systemd-boot-0.ebuild 716 BLAKE2B 97181a78ff7abbfb269ce46baf90706b6c090fd7c04b8e39f39e6f6a3f94d711012989563640eb6e718d6e902bb9c800fcf06f8177484b8c2c6d5d97d617a1e2 SHA512 883b676d770f4585b299f52be93c16e3b44ae45b2ce4acb915118f35c3bb783a37d0a79503d8390497ae593cbb3bd6f1a6c2e74ada1c854a199a8dc559fbaf43
+EBUILD installkernel-systemd-boot-1.ebuild 804 BLAKE2B e9d7fda65405bba43dabe2e197845af9236d6e0e237cd665a4e4a15218b5d4617860a0e73f9206060bbfb4fc9a635109c00e9406667dba77aa718e35dfcc14bc SHA512 47f1e8bfdf370effc2f747512b722c20f822e00a2ea697c28a2986f4eca47f95baf1014109247d81395155d76f29ed7176676c8563e790ddba1625832dfbd431
 MISC metadata.xml 266 BLAKE2B 07f7a78e2144dbbc8dec8ce2d19036d908f1cf520e6ea7b6b90c8b5e370a14421e80d502beb02a4622804afd56a2de75f4784eedea9af7f31bdd55db961ba223 SHA512 a9ab3d1f315fafca7adf0b5a6f34174154a483b289fec3f43f2b4f09ed0d7b1ebdf0b7068a96f0bc38a07460e42fc15bba02050ef17a1ed5ede8457d5fecd56a
diff --git a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
new file mode 100644
index 000000000000..70b966fbf4b3
--- /dev/null
+++ b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# this file is installed by sys-kernel/installkernel-systemd-boot
+
+COMMAND="${1}"
+ENTRY_DIR_ABS="${3}"
+
+# this is exported by kernel-install
+if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; 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}" -gt 0 ]]; 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-1.ebuild b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
new file mode 100644
index 000000000000..ebc400e603b6
--- /dev/null
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-apps/systemd sys-boot/systemd-boot )
+	!<sys-apps/debianutils-4.9-r1[installkernel(+)]
+	!sys-kernel/installkernel-gentoo"
+
+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/
+	doexe "${FILESDIR}/00-00machineid-directory.install"
+}