From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33B04158089 for ; Thu, 9 Nov 2023 07:29:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C3CF2BC01F; Thu, 9 Nov 2023 07:29:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EEC82BC01F for ; Thu, 9 Nov 2023 07:29:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FDA8335CEE for ; Thu, 9 Nov 2023 07:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB5E9132A for ; Thu, 9 Nov 2023 07:29:46 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1699514843.f1e66ba9be4868b666298e8d96f423d9465aab65.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/metadata.xml sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: f1e66ba9be4868b666298e8d96f423d9465aab65 X-VCS-Branch: master Date: Thu, 9 Nov 2023 07:29:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 554315e5-2587-4e7c-a790-59974ae7042a X-Archives-Hash: a937054c8494e9b9cc4a6935a8457e94 commit: f1e66ba9be4868b666298e8d96f423d9465aab65 Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Nov 8 12:06:47 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Nov 9 07:27:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e66ba9 sys-apps/systemd-utils: add USE=kernel-install,ukify AFAIK there is no reason why we could not use systemd's kernel-install with other bootloaders then systemd-boot. The systemd version of kernel-install has the advantage that its behaviour can be customized with plugins. This is the first step to make it possible to use Gentoo's dist-kernels with initrd generators other then Dracut. Previously it was not possible to use ukify with systemd-utils, we now also add a flag for this. Signed-off-by: Andrew Ammerlaan gentoo.org> sys-apps/systemd-utils/metadata.xml | 2 + ...4.5-r1.ebuild => systemd-utils-254.5-r2.ebuild} | 56 +++++++++++++++------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml index a5585a7ca034..e2af023a5096 100644 --- a/sys-apps/systemd-utils/metadata.xml +++ b/sys-apps/systemd-utils/metadata.xml @@ -6,10 +6,12 @@ Enable systemd-boot (UEFI boot manager) + Enable kernel-install Enable kernel module loading via sys-apps/kmod Enable systemd-sysusers Enable systemd-tmpfiles Enable systemd-udev (userspace device manager) + Enable systemd-ukify systemd/systemd diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild similarity index 92% rename from sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild rename to sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild index 12e727d7e3fa..d31c70d4444c 100644 --- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild @@ -28,9 +28,11 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev" +IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify" REQUIRED_USE=" - || ( boot tmpfiles sysusers udev ) + || ( kernel-install tmpfiles sysusers udev ) + boot? ( kernel-install ) + ukify? ( boot ) ${PYTHON_REQUIRED_USE} " RESTRICT="!test? ( test )" @@ -61,8 +63,8 @@ DEPEND="${COMMON_DEPEND} PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]' RDEPEND="${COMMON_DEPEND} - boot? ( - !=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] - test? ( ${PEFILE_DEPEND} ) - ) + boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] ) + ukify? ( test? ( ${PEFILE_DEPEND} ) ) ") " @@ -159,11 +159,13 @@ multilib_src_configure() { -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" -Dsysvinit-path= $(meson_native_use_bool boot bootloader) + $(meson_native_use_bool kernel-install) $(meson_native_use_bool selinux) $(meson_native_use_bool sysusers) $(meson_use test tests) $(meson_native_use_bool tmpfiles) $(meson_use udev hwdb) + $(meson_native_use_bool ukify) # Link staticly with libsystemd-shared -Dlink-boot-shared=false @@ -282,14 +284,18 @@ multilib_src_compile() { if use boot; then targets+=( bootctl - kernel-install man/bootctl.1 - man/kernel-install.8 - 90-loaderentry.install src/boot/efi/linux$(efi_arch).efi.stub src/boot/efi/systemd-boot$(efi_arch).efi ) fi + if use kernel-install; then + targets+=( + kernel-install + 90-loaderentry.install + man/kernel-install.8 + ) + fi if use sysusers; then targets+=( systemd-sysusers.standalone @@ -359,6 +365,13 @@ multilib_src_compile() { ) fi fi + if use ukify; then + targets+=( + ukify + 60-ukify.install + man/ukify.1 + ) + fi fi if use udev; then targets+=( @@ -425,14 +438,19 @@ multilib_src_install() { if multilib_is_native_abi; then if use boot; then into /usr - dobin bootctl kernel-install - doman man/{bootctl.1,kernel-install.8} - # 90-loaderentry.install is generated from 90-loaderentry.install.in - exeinto usr/lib/kernel/install.d - doexe src/kernel-install/*.install + dobin bootctl + doman man/bootctl.1 insinto usr/lib/systemd/boot/efi doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi} fi + if use kernel-install; then + dobin kernel-install + doman man/kernel-install.8 + # copy the default set of plugins + cp "${S}/src/kernel-install/"*.install src/kernel-install || die + exeinto usr/lib/kernel/install.d + doexe src/kernel-install/*.install + fi if use sysusers; then into "${rootprefix:-/}" newbin systemd-sysusers{.standalone,} @@ -468,6 +486,11 @@ multilib_src_install() { doman man/libudev.3 doman man/udev_*.3 fi + if use ukify; then + exeinto "${rootprefix}"/lib/systemd/ + doexe ukify + doman man/ukify.1 + fi fi if use udev; then meson_install --no-rebuild --tags libudev @@ -524,6 +547,7 @@ multilib_src_install_all() { doins shell-completion/zsh/_udevadm fi + use ukify && python_fix_shebang "${ED}" use boot && secureboot_auto_sign }