commit: 947415a47a2c8471d6af51b7982ac128512f0f1f Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sat Feb 24 05:58:36 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Feb 24 06:01:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947415a4
sys-kernel/installkernel-systemd: treeclean Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> profiles/features/prefix/package.mask | 1 - profiles/package.mask | 10 ------ ...l-systemd-2-r2-00-00machineid-directory.install | 32 ------------------- ...nstallkernel-systemd-3-10-copy-prebuilt.install | 24 --------------- .../installkernel-systemd-3.ebuild | 36 ---------------------- .../installkernel-systemd-4-r1.ebuild | 23 -------------- sys-kernel/installkernel-systemd/metadata.xml | 9 ------ 7 files changed, 135 deletions(-) diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask index 3a54bbdc93cb..fb04d3abbc1c 100644 --- a/profiles/features/prefix/package.mask +++ b/profiles/features/prefix/package.mask @@ -13,6 +13,5 @@ gnome-extra/gnome-user-share gnome-extra/office-runner sys-apps/gentoo-systemd-integration sys-apps/systemd-readahead -sys-kernel/installkernel-systemd sys-process/systemd-cron www-misc/profile-sync-daemon diff --git a/profiles/package.mask b/profiles/package.mask index 29ac74f60991..823faadc09ec 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -184,16 +184,6 @@ mail-filter/libsrs_alt ~app-misc/ddcutil-2.1.0 ~app-misc/ddcui-0.5.0 -# Andrew Ammerlaan <[email protected]> (2024-01-24) -# The functionality of sys-kernel/installkernel-systemd has been -# integrated into sys-kernel/installkernel[systemd]. -# Please install sys-kernel/installkernel and remove -# sys-kernel/installkernel-systemd. See the news item entitled -# "Merging of installkernel-gentoo and installkernel-systemd" for details. -# -# Removal on 2024-02-24 -sys-kernel/installkernel-systemd - # Michał Górny <[email protected]> (2024-01-24) # Unmaintained, tests fail, requires discontinued dev-python/bsddb3. # No commits since 2022. No reverse dependencies. 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 deleted file mode 100644 index 54871f9e70eb..000000000000 --- a/sys-kernel/installkernel-systemd/files/installkernel-systemd-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 - -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/files/installkernel-systemd-3-10-copy-prebuilt.install b/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install deleted file mode 100644 index 56f4641d9664..000000000000 --- a/sys-kernel/installkernel-systemd/files/installkernel-systemd-3-10-copy-prebuilt.install +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100644 index eea709e13c17..000000000000 --- a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2019-2024 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 - || ( - 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 -} diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild deleted file mode 100644 index 966d2b793403..000000000000 --- a/sys-kernel/installkernel-systemd/installkernel-systemd-4-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2019-2024 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" - -PDEPEND=">=sys-kernel/installkernel-14[systemd]" - -pkg_setup() { - elog "The wrapper functionality of ${PN} has been integrated into" - elog "sys-kernel/installkernel[systemd]." - elog "${PN} can be safely removed and replaced:" - elog - elog "emerge --noreplace sys-kernel/installkernel" - elog "emerge --depclean sys-kernel/installkernel-systemd" -} diff --git a/sys-kernel/installkernel-systemd/metadata.xml b/sys-kernel/installkernel-systemd/metadata.xml deleted file mode 100644 index d0bc8cdd567e..000000000000 --- a/sys-kernel/installkernel-systemd/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Distribution Kernel Project</name> - </maintainer> - <stabilize-allarches/> -</pkgmetadata>
