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 5A48C15806E for ; Sat, 27 May 2023 00:06:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 364BCE087B; Sat, 27 May 2023 00:06:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 17C34E087B for ; Sat, 27 May 2023 00:06:38 +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 ED535340B0B for ; Sat, 27 May 2023 00:06:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A2C4A6D for ; Sat, 27 May 2023 00:06:35 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1685144649.157ce3e12d036181cac53b02642cce711512bb19.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/metadata.xml sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 157ce3e12d036181cac53b02642cce711512bb19 X-VCS-Branch: master Date: Sat, 27 May 2023 00:06:35 +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: ec1d9135-09bf-4b10-8e73-463f19b96f96 X-Archives-Hash: 00921a5c5d4f9d873a52eeca74e41271 commit: 157ce3e12d036181cac53b02642cce711512bb19 Author: Mike Gilbert gentoo org> AuthorDate: Fri May 26 23:43:13 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri May 26 23:44:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157ce3e1 sys-apps/systemd: rename 'gnuefi USE flag to 'boot', update deps Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/metadata.xml | 1 + sys-apps/systemd/systemd-9999.ebuild | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 34a269d81d85..9576ddd514ee 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -10,6 +10,7 @@ Enable support for sys-process/audit + Enable EFI boot manager and stub loader Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). Enable support for uploading journals Enable cryptsetup tools (includes unit generator for crypttab) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 8c40a935e8a7..6353d8f18ef3 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -35,8 +35,8 @@ HOMEPAGE="http://systemd.io/" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" IUSE=" - acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod + acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils + fido2 +gcrypt gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd " @@ -90,7 +90,6 @@ COMMON_DEPEND=" # Newer linux-headers needed by ia64, bug #480218 DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) " # baselayout-2.2 has /run @@ -162,11 +161,15 @@ BDEPEND=" dev-libs/libxslt:0 $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') + boot? ( $(python_gen_any_dep 'dev-python/pyelftools[${PYTHON_USEDEP}]') ) " python_check_deps() { - python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && - python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" || return + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" || return + if use boot; then + python_has_version "dev-python/pyelftools[${PYTHON_USEDEP}]" || return + fi } QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" @@ -279,16 +282,14 @@ multilib_src_configure() { $(meson_native_use_bool acl) $(meson_native_use_bool apparmor) $(meson_native_use_bool audit) + $(meson_native_use_bool boot bootloader) $(meson_native_use_bool cryptsetup libcryptsetup) $(meson_native_use_bool curl libcurl) $(meson_native_use_bool dns-over-tls dns-over-tls) $(meson_native_use_bool elfutils) $(meson_native_use_bool fido2 libfido2) $(meson_use gcrypt) - $(meson_native_use_bool gnuefi gnu-efi) $(meson_native_use_bool gnutls) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" $(meson_native_use_bool homed) $(meson_native_use_bool http microhttpd) $(meson_native_use_bool idn)