diff --git a/sys-kernel/booster/Manifest b/sys-kernel/booster/Manifest index 303d48f..d91c2a3 100644 --- a/sys-kernel/booster/Manifest +++ b/sys-kernel/booster/Manifest @@ -1,4 +1,2 @@ -DIST booster-0.11_p20240709-vendor.tar.xz 1951976 BLAKE2B 9091ebb47a93d266b6542097074a72757f7e6f5520a799dbc2dc97327af54c27472dab6bab1b186fde8ec28373fb2ab350a20321b4657d104a0f51bb100cfb78 SHA512 b73ee71583287ce58019432d8cbcc5e3c5c834b8571982273cac07e21b4ec99b45f1195957850c9b039b314cee508cace9154f97942f7bc9d2ffabc8897b7931 -DIST booster-0.11_p20240709.tar.gz 116998 BLAKE2B 0c2a5eb06761a4d1ccaf73028179164936714b8bfb0c4f614b6fd58b7052d567b1a1a7215ce70da8dca9025d0984c4bd2b721e9406a7ef9799d4b222e3cf1cfd SHA512 381ab381e9a44eb3de7ea25aa65969264fdb8c42aa0dcdbf9edd247ca8a0d340288b08b906fd6a4be2d4978a68a0057bda88e726edc87d6d02d46d7c56c7f3ef DIST booster-0.12_p20251115-vendor.tar.xz 2103956 BLAKE2B 349a9e239ecce3a058f85b57fc8599fe803d2be58ccd9eaddc337e75420dd048cb6e70c7b2aef5360414257622d64a85242bb6f9f50746038912663537318c33 SHA512 e1eb793cfb29612655b36dfb51e395b0ae3907628e4a308a6b3fd65d4fb02e4d64ab1c12d65b72de296d96b031823a72c278c6ace3fde43363ee7938413177ea DIST booster-0.12_p20251115.tar.gz 116506 BLAKE2B d6ec137e27a93a4260ee9616912373fac3a7a343d47996061f9a6fa08aeb09531580d81baad54107f83a38f36a4225eec01cd4ed1e3d39fae7d05cd4504f33be SHA512 098f94788991f573c50c7760db064616267949f8456661ff8deb6250fcd30d631223f708e96b178cbd14d7fa42faf9324da44acf090f488ef115ffd8f958f5ef diff --git a/sys-kernel/booster/booster-0.11_p20240709-r1.ebuild b/sys-kernel/booster/booster-0.11_p20240709-r1.ebuild deleted file mode 100644 index c2fc128..0000000 --- a/sys-kernel/booster/booster-0.11_p20240709-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -EGIT_COMMIT=276a3efc4336e866e3944359ecd86658d6354eb9 -DESCRIPTION="Fast and secure initramfs generator" -HOMEPAGE="https://github.com/anatol/booster" -SRC_URI="https://github.com/anatol/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - https://git.millerson.name/alex/gentoo-artifacts/releases/download/${P}-vendor/${P}-vendor.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="kernel-install installkernel" - -DEPEND="kernel-install? ( - || ( - sys-apps/systemd-utils - sys-apps/systemd - ) - ) - installkernel? ( sys-kernel/installkernel ) - " -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/0001-Add-Gentoo-kernel-config-search-path.patch" - ) - default -} - -src_compile() { - cd ${S}/generator && ego build - cd ${S}/init && ego build -} - -src_install() { - insinto /etc - newins "${FILESDIR}/${PN}.yaml" ${PN}.yaml - - if use installkernel; then - # Install the kernel preinst.d hook - exeinto /usr/lib/kernel/preinst.d - newexe "${FILESDIR}/installkernel-52-booster.install" 52-booster.install - fi - if use kernel-install; then - exeinto /usr/lib/kernel/install.d - newexe "${FILESDIR}/kernel-install-52-booster.install" 52-booster.install - fi - - exeinto /usr/lib/${PN} - doexe init/init - - newbin generator/generator ${PN} - - default -} diff --git a/sys-kernel/booster/booster-0.12_p20251115.ebuild b/sys-kernel/booster/booster-0.12_p20251115.ebuild index e29dd38..7cd770a 100644 --- a/sys-kernel/booster/booster-0.12_p20251115.ebuild +++ b/sys-kernel/booster/booster-0.12_p20251115.ebuild @@ -15,44 +15,43 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + IUSE="kernel-install installkernel" DEPEND="kernel-install? ( - || ( - sys-apps/systemd-utils - sys-apps/systemd - ) - ) - installkernel? ( sys-kernel/installkernel ) - " + || ( + sys-apps/systemd-utils + sys-apps/systemd + ) + ) + installkernel? ( sys-kernel/installkernel ) + " RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" src_compile() { - cd ${S}/generator && ego build - cd ${S}/init && ego build + cd "${S}/generator" && ego build + cd "${S}/init" && ego build } src_install() { - insinto /etc - newins "${FILESDIR}/${PN}.yaml" ${PN}.yaml + insinto /etc + newins "${FILESDIR}/${PN}.yaml" "${PN}.yaml" - if use installkernel; then - # Install the kernel preinst.d hook - exeinto /usr/lib/kernel/preinst.d - newexe "${FILESDIR}/installkernel-52-booster.install" 52-booster.install - fi - if use kernel-install; then - exeinto /usr/lib/kernel/install.d - doexe packaging/common/50-booster.install - fi + if use installkernel; then + # Install the kernel preinst.d hook + exeinto /usr/lib/kernel/preinst.d + newexe "${FILESDIR}/installkernel-52-booster.install" 52-booster.install + fi + if use kernel-install; then + exeinto /usr/lib/kernel/install.d + doexe packaging/common/50-booster.install + fi - exeinto /usr/lib/${PN} - doexe init/init + exeinto "/usr/lib/${PN}" + doexe init/init - newbin generator/generator ${PN} + newbin generator/generator "${PN}" - default + default } diff --git a/sys-kernel/booster/files/0001-Add-Gentoo-kernel-config-search-path.patch b/sys-kernel/booster/files/0001-Add-Gentoo-kernel-config-search-path.patch deleted file mode 100644 index a64ef60..0000000 --- a/sys-kernel/booster/files/0001-Add-Gentoo-kernel-config-search-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dce149dc0ce7b13bc6a27997c0b2fe9b9591c752 Mon Sep 17 00:00:00 2001 -From: Alexander Miroshnichenko -Date: Tue, 1 Oct 2024 15:59:44 +0300 -Subject: [PATCH] Add Gentoo kernel config search path -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Signed-off-by: Alexander Miroshnichenko ---- - generator/kmod.go | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/generator/kmod.go b/generator/kmod.go -index d4bf31dbed5e..46960d639cc2 100644 ---- a/generator/kmod.go -+++ b/generator/kmod.go -@@ -734,6 +734,11 @@ func readCompiledInComponents(kernelVersion string) (set, error) { - debug("reading %s", f.Name()) - defer f.Close() - r = f -+ } else if f, err := os.Open("/lib/modules/" + kernelVersion + "/config"); err == nil { -+ // Gentoo have config in src. -+ debug("reading %s", f.Name()) -+ defer f.Close() -+ r = f - } else if f, err := os.Open("/proc/config"); err == nil { - debug("reading %s", f.Name()) - defer f.Close() --- -2.39.3 - diff --git a/sys-kernel/booster/files/kernel-install-52-booster.install b/sys-kernel/booster/files/kernel-install-52-booster.install deleted file mode 100644 index c97bc18..0000000 --- a/sys-kernel/booster/files/kernel-install-52-booster.install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -COMMAND="${1:?}" -KERNEL_VERSION="${2:?}" - -# Do not attempt to create initramfs if the supplied image is already a UKI -[ "${KERNEL_INSTALL_IMAGE_TYPE}" = "uki" ] && exit 0 - -# Only run if the initrd generator is booster -[ "${KERNEL_INSTALL_INITRD_GENERATOR}" = "booster" ] || exit 0 - -# only run when the COMMAND is add, and fewer than 5 arguments are passed -[ "${COMMAND}" = "add" ] && [ "${#}" -lt 5 ] || exit 0 - -booster "$([ "${KERNEL_INSTALL_VERBOSE}" = 1 ] && echo --verbose)" build --force --kernel-version="${KERNEL_VERSION}" "${KERNEL_INSTALL_STAGING_AREA}/initrd" || exit 1