From 784bf231299964f1ef28fb33534ee916bc377bca Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Date: Wed, 8 Nov 2023 14:22:06 +0100
Subject: */*: move sys-kernel/installkernel-systemd-boot to
 sys-kernel/installkernel-systemd

This reflects better that we don't necessarily need the systemd bootloader
to use the systemd kernel-install system.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
---
 .../installkernel-gentoo-7.ebuild                  |  2 +-
 .../files/00-00machineid-directory.install         | 28 ----------------
 ...temd-boot-2-r2-00-00machineid-directory.install | 32 -------------------
 .../installkernel-systemd-boot-2-r1.ebuild         | 29 -----------------
 .../installkernel-systemd-boot-2-r3.ebuild         | 35 --------------------
 .../installkernel-systemd-boot-2-r4.ebuild         | 37 ----------------------
 sys-kernel/installkernel-systemd-boot/metadata.xml |  8 -----
 .../files/00-00machineid-directory.install         | 28 ++++++++++++++++
 ...l-systemd-2-r2-00-00machineid-directory.install | 32 +++++++++++++++++++
 .../installkernel-systemd-2-r1.ebuild              | 29 +++++++++++++++++
 .../installkernel-systemd-2-r3.ebuild              | 35 ++++++++++++++++++++
 .../installkernel-systemd-2-r4.ebuild              | 37 ++++++++++++++++++++++
 sys-kernel/installkernel-systemd/metadata.xml      |  8 +++++
 13 files changed, 170 insertions(+), 170 deletions(-)
 delete mode 100644 sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
 delete mode 100644 sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
 delete mode 100644 sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
 delete mode 100644 sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
 delete mode 100644 sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
 delete mode 100644 sys-kernel/installkernel-systemd-boot/metadata.xml
 create mode 100644 sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
 create mode 100644 sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
 create mode 100644 sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
 create mode 100644 sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild
 create mode 100644 sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
 create mode 100644 sys-kernel/installkernel-systemd/metadata.xml

(limited to 'sys-kernel')

diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
index 3a1e960924ef..a62868a3c86b 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
@@ -16,7 +16,7 @@ IUSE="grub"
 RDEPEND="
 	>=sys-apps/debianutils-4.9-r1
 	!<sys-apps/debianutils-4.9-r1[installkernel(+)]
-	!sys-kernel/installkernel-systemd-boot"
+	!sys-kernel/installkernel-systemd"
 
 src_install() {
 	into /
diff --git a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
deleted file mode 100644
index 70b966fbf4b3..000000000000
--- a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/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
deleted file mode 100644
index 5fa3bbeffc04..000000000000
--- a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/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-r1.ebuild b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
deleted file mode 100644
index b4b0308233e7..000000000000
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2023 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-apps/systemd-utils[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"
-}
diff --git a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
deleted file mode 100644
index 6ecb8c8f7702..000000000000
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 ~loong ppc64 x86"
-
-RDEPEND="
-	!sys-kernel/installkernel-gentoo
-	|| (
-		sys-apps/systemd[gnuefi(-)]
-		sys-apps/systemd[boot(-)]
-		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}/${PN}-2-r2-00-00machineid-directory.install" \
-		00-00machineid-directory.install
-}
diff --git a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
deleted file mode 100644
index d7515ea40e93..000000000000
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 ~loong ppc64 x86"
-
-RDEPEND="
-	!sys-kernel/installkernel-gentoo
-	|| (
-		sys-apps/systemd[gnuefi(-)]
-		sys-apps/systemd[boot(-)]
-		sys-apps/systemd[kernel-install(-)]
-		sys-apps/systemd-utils[boot]
-		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
-}
diff --git a/sys-kernel/installkernel-systemd-boot/metadata.xml b/sys-kernel/installkernel-systemd-boot/metadata.xml
deleted file mode 100644
index fae0ca9e8b97..000000000000
--- a/sys-kernel/installkernel-systemd-boot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>dist-kernel@gentoo.org</email>
-		<name>Distribution Kernel Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install b/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
new file mode 100644
index 000000000000..06a519577f76
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# this file is installed by sys-kernel/installkernel-systemd
+
+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/files/installkernel-systemd-2-r2-00-00machineid-directory.install b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
new file mode 100644
index 000000000000..54871f9e70eb
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# this file is installed by sys-kernel/installkernel-systemd
+
+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/installkernel-systemd-2-r1.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
new file mode 100644
index 000000000000..b4b0308233e7
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2023 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-apps/systemd-utils[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"
+}
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild
new file mode 100644
index 000000000000..6ecb8c8f7702
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild
@@ -0,0 +1,35 @@
+# 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 ~loong ppc64 x86"
+
+RDEPEND="
+	!sys-kernel/installkernel-gentoo
+	|| (
+		sys-apps/systemd[gnuefi(-)]
+		sys-apps/systemd[boot(-)]
+		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}/${PN}-2-r2-00-00machineid-directory.install" \
+		00-00machineid-directory.install
+}
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
new file mode 100644
index 000000000000..d7515ea40e93
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
@@ -0,0 +1,37 @@
+# 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 ~loong ppc64 x86"
+
+RDEPEND="
+	!sys-kernel/installkernel-gentoo
+	|| (
+		sys-apps/systemd[gnuefi(-)]
+		sys-apps/systemd[boot(-)]
+		sys-apps/systemd[kernel-install(-)]
+		sys-apps/systemd-utils[boot]
+		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
+}
diff --git a/sys-kernel/installkernel-systemd/metadata.xml b/sys-kernel/installkernel-systemd/metadata.xml
new file mode 100644
index 000000000000..fae0ca9e8b97
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>dist-kernel@gentoo.org</email>
+		<name>Distribution Kernel Project</name>
+	</maintainer>
+</pkgmetadata>
-- 
cgit v1.2.3-65-gdbad