[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd/files/, sys-kernel/installkernel-systemd/

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-systemd/files/, sys-kernel/installkernel-systemd/

[Andrew Ammerlaan]

commit:     3f27e12a55cf0b4c4d82e09df5b0d9daeef92703
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  8 19:20:17 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 07:27:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f27e12a

sys-kernel/installkernel-systemd: drop 2-r1, 2-r3

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

 .../files/00-00machineid-directory.install         | 28 -----------------
 .../installkernel-systemd-2-r1.ebuild              | 29 ------------------
 .../installkernel-systemd-2-r3.ebuild              | 35 ----------------------
 3 files changed, 92 deletions(-)

diff --git a/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install b/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
deleted file mode 100644
index 06a519577f76..000000000000
--- a/sys-kernel/installkernel-systemd/files/00-00machineid-directory.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/installkernel-systemd-2-r1.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r1.ebuild
deleted file mode 100644
index b4b0308233e7..000000000000
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-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/installkernel-systemd-2-r3.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r3.ebuild
deleted file mode 100644
index 6ecb8c8f7702..000000000000
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-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
-}