From 91b873ea3e20149dbb554dc214611efa4627962a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Nov 2023 10:28:50 +0000 Subject: gentoo auto-resync : 09:11:2023 - 10:28:50 --- sys-kernel/Manifest.gz | Bin 4581 -> 4573 bytes sys-kernel/installkernel-gentoo/Manifest | 2 +- .../installkernel-gentoo-7.ebuild | 2 +- sys-kernel/installkernel-systemd-boot/Manifest | 5 --- .../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 ------------------- sys-kernel/installkernel-systemd-boot/metadata.xml | 8 ----- sys-kernel/installkernel-systemd/Manifest | 3 ++ ...l-systemd-2-r2-00-00machineid-directory.install | 32 ++++++++++++++++++ .../installkernel-systemd-2-r4.ebuild | 37 +++++++++++++++++++++ sys-kernel/installkernel-systemd/metadata.xml | 8 +++++ 13 files changed, 82 insertions(+), 139 deletions(-) delete mode 100644 sys-kernel/installkernel-systemd-boot/Manifest 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/metadata.xml create mode 100644 sys-kernel/installkernel-systemd/Manifest 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-r4.ebuild create mode 100644 sys-kernel/installkernel-systemd/metadata.xml (limited to 'sys-kernel') diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index efe1910f9786..388f87d60d35 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/installkernel-gentoo/Manifest b/sys-kernel/installkernel-gentoo/Manifest index 28a80a8ecaa9..91d54cd5c417 100644 --- a/sys-kernel/installkernel-gentoo/Manifest +++ b/sys-kernel/installkernel-gentoo/Manifest @@ -1,3 +1,3 @@ DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b SHA512 9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e -EBUILD installkernel-gentoo-7.ebuild 1097 BLAKE2B b99166038b37ae2833160ec598520d7fbd443177197045a046ccbb97db35ad8e87d24130cb2df6f20d37371921995c666127a0b731895f53b24da4e6c9957aa2 SHA512 451b0da40a65fe00e09f2c795a3da753bbc8e84e58de112f0bf4d43d178e94e9bcec8feaf0265699d82f06754b7287e3da2e77b9de11343ca9d2c16bb2ceb02d +EBUILD installkernel-gentoo-7.ebuild 1092 BLAKE2B b549038bc3464d9065a8ee677ba52ca98a2d30bc61acaf79220f0402731621ef2f00203b9fecf0103dfce32153db9f9cc7fcecfc5b22a5d028408ccc02891c0f SHA512 e3585dca416081f92a7fb082da1e3924d569d8ffe91cf27dec5d4411467fec1a77b22b2bea95ef516606ed3c1c40ae7a4f523bd08efea56ba97efae967522c20 MISC metadata.xml 450 BLAKE2B 67538f7d8059e68c7b1e84b29d7ea4a579af9238fe65f4fb8fe29b83760b38b6e586c2b7d2e12b5bab31ac5484def40b2814d084d62f7cdf867b32cd85526788 SHA512 16efb4e63b44889af229a18c4da550a7be0e6a8ab2d7538aca6976bb0eca7d9be120e0d394e0ccf90f20e79a1f0b790da695ac355db278bb7b8d6e6415be29f9 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 !) -# 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/) -# 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] ) - ! - - - - dist-kernel@gentoo.org - Distribution Kernel Project - - diff --git a/sys-kernel/installkernel-systemd/Manifest b/sys-kernel/installkernel-systemd/Manifest new file mode 100644 index 000000000000..8dc38a039aa3 --- /dev/null +++ b/sys-kernel/installkernel-systemd/Manifest @@ -0,0 +1,3 @@ +AUX installkernel-systemd-2-r2-00-00machineid-directory.install 732 BLAKE2B eb0d08c8d266cf57e35a618ca0f87b25ea59df5a9ea11bcb076d4a9e4c269a9a60040493d61ea8e39f785d3bfb8c4920dfc738112960570b4682f1bb7e33ce8a SHA512 01dfa27c76b23d6ddec354118b2573eb244bd11b1a626f3cf6fcc205f0c6bd11c11f518e8460de16c83d9074ed759ba2251ed892cbadac17784e611a64cb404e +EBUILD installkernel-systemd-2-r4.ebuild 954 BLAKE2B 4f1d14062b56663b79d71a47ff4f5d58dc719c697a6febb668494a0dac0c43f3315a30d1e91364146258a85049ac058d1fde6d4b18e34945c5f9e538a9140d41 SHA512 b7a5204ea1014bb3ea2f549ccc787a9807bb204a6fc26af25f169f62f5c52be067ed8d074cd7d719d6dde02d0ded4abd94c6e4f1d978fda8f63355cb7fb76d30 +MISC metadata.xml 267 BLAKE2B 4449a3159ae97fc4f2152d9305dc77bf8df18a3dc3ae5881b9e56fc0a30da17d7dabf24901b421389b0cea4b7f0037f46e193d8a74a79431c1ccbd3db1fde9ea SHA512 54190f2ef340d1e355087b7a9af6f651be3704bbf23600f024eabb1bdffd36fd92c1f3f37b409dbde82f52b5287e08a427537ca1028bc326d19470f755cefd43 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/) +# 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-r4.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild new file mode 100644 index 000000000000..219ca981dfe2 --- /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 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 @@ + + + + + dist-kernel@gentoo.org + Distribution Kernel Project + + -- cgit v1.2.3