From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1727576-garchives=archives.gentoo.org@lists.gentoo.org> 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9FB521584F2 for <garchives@archives.gentoo.org>; Fri, 14 Mar 2025 05:32:29 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8BB8334316E for <garchives@archives.gentoo.org>; Fri, 14 Mar 2025 05:32:29 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2ECE91103CF; Fri, 14 Mar 2025 05:32:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 213431103CF for <gentoo-commits@lists.gentoo.org>; Fri, 14 Mar 2025 05:32:19 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AAD8343081 for <gentoo-commits@lists.gentoo.org>; Fri, 14 Mar 2025 05:32:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0E26261E for <gentoo-commits@lists.gentoo.org>; Fri, 14 Mar 2025 05:32:15 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1741930252.a687f806adfd3dc334b1385ce755747a25129610.sam@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/Manifest sys-apps/systemd-utils/systemd-utils-255.16.ebuild sys-apps/systemd-utils/systemd-utils-255.17.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a687f806adfd3dc334b1385ce755747a25129610 X-VCS-Branch: master Date: Fri, 14 Mar 2025 05:32:15 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f74fa91-f948-4fe0-ae6d-89e2b0918977 X-Archives-Hash: ad3b83c70d121b3b2f2b94012ea6de8e commit: a687f806adfd3dc334b1385ce755747a25129610 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 14 05:30:52 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 14 05:30:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a687f806 sys-apps/systemd-utils: drop 255.16, 255.17 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/systemd-utils/Manifest | 2 - sys-apps/systemd-utils/systemd-utils-255.16.ebuild | 623 --------------------- sys-apps/systemd-utils/systemd-utils-255.17.ebuild | 623 --------------------- 3 files changed, 1248 deletions(-) diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index 31b9531cd371..a3f33cb8f8de 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -9,6 +9,4 @@ DIST systemd-musl-patches-256.8.tar.gz 27395 BLAKE2B c387670f46bb7a484ca320ee8c8 DIST systemd-stable-254.22.tar.gz 14667273 BLAKE2B d3bfbd34ef47b73e139c37dd3e961fdc17c969e38674d84976183ecad44030fce1db073da6faf522e9ab232ae65c8e70a8d9a1f15053c57269090d3a9f1756f7 SHA512 5cef3912e68060366d7a8030c13825ae872783dd55a8a3ab15aa5ff2c397b50df8fc6e08b9bd1fdc0d54f08f3f7765484a41af0646ded238512921e3d02b553d DIST systemd-stable-254.24.tar.gz 14718567 BLAKE2B a3389e671f78db398d627f39761cb44a7db9904f4ca987d00073495eb0f80980118459440ee6556d4278c28939bc93167ec8e56885d14eecd17635a2d1aec7da SHA512 f2f5f30c2fd0246ca359bbf04f06fbb49685d58c0d7d4fab6031f98ffebd552141f05ea33c22aeef11338a90ad12389ccb887d9d2d2542d5124b3efd51638343 DIST systemd-stable-255.15.tar.gz 15207869 BLAKE2B 5bd314f008782d5d6148bf6a0ab437be23e71ca4dab1fc0aff61e6cc17e9b43da7fbae5a1bfa7d829ba0d8dcb28b43a1a2fbd4fcd0d79fd4154336f98fb25a25 SHA512 39e4d03da90bcceb30517098b012cea991067cdd88cf577a23243c28341424e38a5dbb8f92e51b32f8f651e880ae6ca48490f7de8d0dc3525e6629250f546000 -DIST systemd-stable-255.16.tar.gz 15206112 BLAKE2B a5bc9d73b2ae8e1ebe485ab305bd20161500157b366f8678fccdac56f1844614bd14c849493154dcff40f0283467c910dbe7bf0ca501b40a2be1577c269e7544 SHA512 e2c108af8f895bcdeb47b133b2c26db640d5b5b2bcd1ba548faf8c579fa09b1d88f9e89b3b994a4a396a9f0df56d1a0f5833e71c0c66501d418ae4ea78f37889 -DIST systemd-stable-255.17.tar.gz 15206361 BLAKE2B 71b7eb7c90898ee080b258fa6b500b84c588d52bacfd0b3c301b8fd157bc6c6c3ddde11bb3f94a5f162038c527779872586622da1e0cafb9f8685c541ab6a7a6 SHA512 441f27764af708bb1165e671eee8fa5686adbb32f1a4761fef2d89b882d879534d2e74f7e04028ab06457aaa5173fdbcb099aaa20bb0d23b36ed59e8c7ad1887 DIST systemd-stable-255.18.tar.gz 15258834 BLAKE2B 03b97b0bb6f5cd8f93bf72c40cf52426c07ab5fa74bd19caf771d54e823fa321de633ef3cc6e482210250c1408e092a6dae6710e992ac2a4b3c5e9670d803adc SHA512 4550fa313a45b277dc32df74a13cfd06486ced724f40c1eebc61a9ba76f79b58dd4372da851710cb5d8bb13e98a5cfcb377fe22171ef5bee0209f4bf067c87ad diff --git a/sys-apps/systemd-utils/systemd-utils-255.16.ebuild b/sys-apps/systemd-utils/systemd-utils-255.16.ebuild deleted file mode 100644 index ecdb11ece220..000000000000 --- a/sys-apps/systemd-utils/systemd-utils-255.16.ebuild +++ /dev/null @@ -1,623 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) - -QA_PKGCONFIG_VERSION=$(ver_cut 1) - -inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils -inherit python-single-r1 secureboot udev - -DESCRIPTION="Utilities split out from systemd for OpenRC users" -HOMEPAGE="https://systemd.io/" - -if [[ ${PV} == *.* ]]; then - MY_P="systemd-stable-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" -else - MY_P="systemd-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" -fi - -MUSL_PATCHSET="systemd-musl-patches-255.14" -SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify" -REQUIRED_USE=" - || ( kernel-install tmpfiles sysusers udev ) - boot? ( kernel-install ) - ukify? ( boot ) - ${PYTHON_REQUIRED_USE} -" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - elibc_musl? ( >=sys-libs/musl-1.2.3 ) - selinux? ( sys-libs/libselinux:0= ) - tmpfiles? ( - acl? ( sys-apps/acl:0= ) - ) - udev? ( - >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - kmod? ( >=sys-apps/kmod-15:0= ) - ) - !udev? ( - >=sys-apps/util-linux-2.30:0= - sys-libs/libcap:0= - virtual/libcrypt:= - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.11 -" - -PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]' - -RDEPEND="${COMMON_DEPEND} - boot? ( !<sys-boot/systemd-boot-250 ) - ukify? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep "${PEFILE_DEPEND}") - ) - tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) - udev? ( - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/floppy - acct-group/input - acct-group/kmem - acct-group/kvm - acct-group/lp - acct-group/render - acct-group/sgx - acct-group/tape - acct-group/tty - acct-group/usb - acct-group/video - !sys-apps/gentoo-systemd-integration - !<sys-fs/udev-250 - !sys-fs/eudev - ) - !sys-apps/systemd -" -PDEPEND=" - udev? ( >=sys-fs/udev-init-scripts-34 ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gperf - dev-util/patchelf - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig - $(python_gen_cond_dep " - dev-python/jinja2[\${PYTHON_USEDEP}] - dev-python/lxml[\${PYTHON_USEDEP}] - boot? ( - >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] - test? ( ${PEFILE_DEPEND} ) - ) - ") -" - -TMPFILES_OPTIONAL=1 -UDEV_OPTIONAL=1 - -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" - -CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" - -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then - linux-info_pkg_setup - fi - use boot && secureboot_pkg_setup -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch" - ) - - if use elibc_musl; then - PATCHES+=( - "${WORKDIR}/${MUSL_PATCHSET}" - "${FILESDIR}/musl-efi-wchar.patch" - ) - fi - default -} - -src_configure() { - python_setup - meson-multilib_src_configure -} - -multilib_src_configure() { - local emesonargs=( - # default is developer, bug 918671 - -Dmode=release - -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) - - # Disable all optional features - -Dadm-group=false - -Danalyze=false - -Dapparmor=false - -Daudit=false - -Dbacklight=false - -Dbinfmt=false - -Dbpf-framework=false - -Dbzip2=false - -Dcoredump=false - -Ddbus=false - -Delfutils=false - -Denvironment-d=false - -Dfdisk=false - -Dgcrypt=false - -Dglib=false - -Dgshadow=false - -Dgnutls=false - -Dhibernate=false - -Dhostnamed=false - -Didn=false - -Dima=false - -Dinitrd=false - -Dfirstboot=false - -Dldconfig=false - -Dlibcryptsetup=false - -Dlibcurl=false - -Dlibfido2=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dlocaled=false - -Dlogind=false - -Dlz4=false - -Dmachined=false - -Dmicrohttpd=false - -Dnetworkd=false - -Dnscd=false - -Dnss-myhostname=false - -Dnss-resolve=false - -Dnss-systemd=false - -Doomd=false - -Dopenssl=false - -Dp11kit=false - -Dpam=false - -Dpcre2=false - -Dpolkit=false - -Dportabled=false - -Dpstore=false - -Dpwquality=false - -Drandomseed=false - -Dresolve=false - -Drfkill=false - -Dseccomp=false - -Dsmack=false - -Dsysext=false - -Dtimedated=false - -Dtimesyncd=false - -Dtpm=false - -Dqrencode=false - -Dquotacheck=false - -Duserdb=false - -Dutmp=false - -Dvconsole=false - -Dwheel-group=false - -Dxdg-autostart=false - -Dxkbcommon=false - -Dxz=false - -Dzlib=false - -Dzstd=false - ) - - if use tmpfiles || use udev; then - emesonargs+=( $(meson_native_use_bool acl) ) - else - emesonargs+=( -Dacl=false ) - fi - - if use udev; then - emesonargs+=( $(meson_native_use_bool kmod) ) - else - emesonargs+=( -Dkmod=false ) - fi - - if use elibc_musl; then - # Avoid redefinition of struct ethhdr. - append-cppflags -D__UAPI_DEF_ETHHDR=0 - fi - - if multilib_is_native_abi || use udev; then - meson_src_configure - fi -} - -have_dmi() { - # see dmi_arches in meson.build - case ${CHOST} in - mips64*) - return 1 ;; - aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*) - return 0 ;; - esac - return 1 -} - -multilib_src_compile() { - local targets=() optional_targets=() - if multilib_is_native_abi; then - if use boot; then - local efi_arch= efi_arch_alt= - case ${CHOST} in - aarch64*) efi_arch=aa64 ;; - arm*) efi_arch=arm ;; - loongarch32*) efi_arch=loongarch32 ;; - loongarch64*) efi_arch=loongarch64 ;; - riscv32*) efi_arch=riscv32 ;; - riscv64*) efi_arch=riscv64 ;; - x86_64*) efi_arch=x64 efi_arch_alt=ia32;; - i?86*) efi_arch=ia32 ;; - esac - targets+=( - bootctl - man/bootctl.1 - src/boot/efi/systemd-boot${efi_arch}.efi - src/boot/efi/linux${efi_arch}.efi.stub - src/boot/efi/addon${efi_arch}.efi.stub - ) - if [[ -n ${efi_arch_alt} ]]; then - # If we have a multilib toolchain, meson.build will build the - # "alt" arch (ia32). There's no easy way to detect this, so try - # to build it and ignore failure. - optional_targets+=( - src/boot/efi/systemd-boot${efi_arch_alt}.efi - src/boot/efi/linux${efi_arch_alt}.efi.stub - src/boot/efi/addon${efi_arch_alt}.efi.stub - ) - fi - - fi - if use kernel-install; then - targets+=( - kernel-install - src/kernel-install/90-loaderentry.install - man/kernel-install.8 - ) - fi - if use sysusers; then - targets+=( - systemd-sysusers - man/sysusers.d.5 - man/systemd-sysusers.8 - ) - if use test; then - targets+=( - systemd-runtest.env - ) - fi - fi - if use tmpfiles; then - targets+=( - systemd-tmpfiles - man/tmpfiles.d.5 - man/systemd-tmpfiles.8 - tmpfiles.d/{etc,static-nodes-permissions,var}.conf - ) - if use test; then - targets+=( - test-offline-passwd - test-tmpfile-util - ) - fi - fi - if use udev; then - targets+=( - udevadm - systemd-hwdb - ata_id - cdrom_id - fido_id - iocost - mtd_probe - scsi_id - v4l_id - src/udev/udev.pc - man/udev.conf.5 - man/systemd.link.5 - man/hwdb.7 - man/udev.7 - man/systemd-hwdb.8 - man/systemd-udevd.service.8 - man/udevadm.8 - man/libudev.3 - man/udev_device_get_syspath.3 - man/udev_device_has_tag.3 - man/udev_device_new_from_syspath.3 - man/udev_enumerate_add_match_subsystem.3 - man/udev_enumerate_new.3 - man/udev_enumerate_scan_devices.3 - man/udev_list_entry.3 - man/udev_monitor_filter_update.3 - man/udev_monitor_new_from_netlink.3 - man/udev_monitor_receive_device.3 - man/udev_new.3 - hwdb.d/60-autosuspend-chromiumos.hwdb - rules.d/50-udev-default.rules - rules.d/60-persistent-storage.rules - rules.d/64-btrfs.rules - # Needed for tests - rules.d/99-systemd.rules - ) - if have_dmi; then - targets+=( dmi_memory_id ) - fi - if use test; then - targets+=( - test-fido-id-desc - test-link-config-tables - test-udev-builtin - test-udev-device-thread - test-udev-format - test-udev-manager - test-udev-node - test-udev-rule-runner - test-udev-rules - test-udev-spawn - test-udev-util - ) - fi - fi - if use ukify; then - targets+=( - ukify - src/kernel-install/60-ukify.install - man/ukify.1 - ) - fi - fi - if use udev; then - targets+=( - libudev - src/libudev/libudev.pc - ) - if use test; then - targets+=( - test-libudev - test-libudev-sym - test-udev-device-thread - ) - fi - fi - if [[ ${#targets[@]} -ne 0 ]]; then - meson_src_compile "${targets[@]}" - fi - if [[ ${#optional_targets[@]} -ne 0 ]]; then - ninja ${NINJAOPTS} "${optional_targets[@]}" - fi -} - -multilib_src_test() { - local tests=() - if multilib_is_native_abi; then - if use boot; then - tests+=( --suite boot ) - fi - if use kernel-install; then - tests+=( --suite kernel-install ) - fi - if use sysusers; then - tests+=( --suite sysusers ) - fi - if use tmpfiles; then - tests+=( --suite tmpfiles ) - fi - if use udev; then - tests+=( --suite udev ) - fi - fi - if use udev; then - tests+=( --suite libudev ) - fi - if [[ ${#tests[@]} -ne 0 ]]; then - meson_src_test --no-rebuild "${tests[@]}" - fi -} - -src_install() { - meson-multilib_src_install -} - -set_rpath() { - patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed" -} - -multilib_src_install() { - if multilib_is_native_abi; then - exeinto "/usr/$(get_libdir)/systemd" - doexe src/shared/libsystemd-shared-${PV%%.*}.so - if use boot; then - set_rpath bootctl - dobin bootctl - doman man/bootctl.1 - meson_install --no-rebuild --tags systemd-boot - fi - if use kernel-install; then - set_rpath kernel-install - dobin kernel-install - doman man/kernel-install.8 - exeinto /usr/lib/kernel/install.d - doexe src/kernel-install/*.install - fi - if use sysusers; then - set_rpath systemd-sysusers - dobin systemd-sysusers - doman man/{systemd-sysusers.8,sysusers.d.5} - fi - if use tmpfiles; then - set_rpath systemd-tmpfiles - dobin systemd-tmpfiles - doman man/{systemd-tmpfiles.8,tmpfiles.d.5} - insinto /usr/lib/tmpfiles.d - doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf - fi - if use udev; then - set_rpath udevadm systemd-hwdb - dobin udevadm systemd-hwdb - dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd - if use split-usr; then - # elogind installs udev rules that hard-code /bin/udevadm - dosym ../usr/bin/udevadm /bin/udevadm - fi - - exeinto /usr/lib/udev - set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} - doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} - - if have_dmi; then - set_rpath dmi_memory_id - doexe dmi_memory_id - fi - - rm -f rules.d/99-systemd.rules - insinto /usr/lib/udev/rules.d - doins rules.d/*.rules - - insinto /usr/lib/udev/hwdb.d - doins hwdb.d/*.hwdb - - insinto /usr/share/pkgconfig - doins src/udev/udev.pc - - doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8} - newman man/systemd-udevd.service.8 systemd-udevd.8 - doman man/libudev.3 - doman man/udev_*.3 - fi - if use ukify; then - dobin ukify - dosym ../../bin/ukify /usr/lib/systemd/ukify - doman man/ukify.1 - fi - fi - if use udev; then - meson_install --no-rebuild --tags libudev - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - fi -} - -multilib_src_install_all() { - einstalldocs - if use boot; then - dobashcomp shell-completion/bash/bootctl - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/{_bootctl,_kernel-install} - fi - if use kernel-install; then - exeinto /usr/lib/kernel/install.d - doexe src/kernel-install/*.install - fi - if use tmpfiles; then - doinitd "${FILESDIR}"/systemd-tmpfiles-setup - doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev - exeinto /etc/cron.daily - doexe "${FILESDIR}"/systemd-tmpfiles-clean - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_systemd-tmpfiles - insinto /usr/lib/tmpfiles.d - doins tmpfiles.d/x11.conf - doins "${FILESDIR}"/{legacy,tmp}.conf - fi - if use udev; then - doheader src/libudev/libudev.h - - insinto /etc/udev - doins src/udev/udev.conf - keepdir /etc/udev/{hwdb.d,rules.d} - - insinto /usr/lib/systemd/network - doins network/99-default.link - - # Remove to avoid conflict with elogind - # https://bugs.gentoo.org/856433 - rm rules.d/70-power-switch.rules || die - insinto /usr/lib/udev/rules.d - doins rules.d/*.rules - doins "${FILESDIR}"/40-gentoo.rules - - insinto /usr/lib/udev/hwdb.d - doins hwdb.d/*.hwdb - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - fi - - use ukify && python_fix_shebang "${ED}" - use boot && secureboot_auto_sign -} - -add_service() { - local initd=$1 - local runlevel=$2 - - ebegin "Adding '${initd}' service to the '${runlevel}' runlevel" - mkdir -p "${EROOT}/etc/runlevels/${runlevel}" && - ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" - eend $? -} - -pkg_preinst() { - # Migrate /lib/{systemd,udev} to /usr/lib - if use split-usr; then - local d - for d in systemd udev; do - dosym ../usr/lib/${d} /lib/${d} - if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then - einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'" - cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die - einfo "Removing '${EROOT}/lib/${d}'" - rm -r "${EROOT}/lib/${d}" || die - fi - done - fi -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - add_service systemd-tmpfiles-setup-dev sysinit - add_service systemd-tmpfiles-setup boot - fi - if use udev; then - ebegin "Updating hwdb" - systemd-hwdb --root="${ROOT}" update - eend $? - udev_reload - fi -} diff --git a/sys-apps/systemd-utils/systemd-utils-255.17.ebuild b/sys-apps/systemd-utils/systemd-utils-255.17.ebuild deleted file mode 100644 index 94f49394cabf..000000000000 --- a/sys-apps/systemd-utils/systemd-utils-255.17.ebuild +++ /dev/null @@ -1,623 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) - -QA_PKGCONFIG_VERSION=$(ver_cut 1) - -inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils -inherit python-single-r1 secureboot udev - -DESCRIPTION="Utilities split out from systemd for OpenRC users" -HOMEPAGE="https://systemd.io/" - -if [[ ${PV} == *.* ]]; then - MY_P="systemd-stable-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" -else - MY_P="systemd-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" -fi - -MUSL_PATCHSET="systemd-musl-patches-255.14" -SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify" -REQUIRED_USE=" - || ( kernel-install tmpfiles sysusers udev ) - boot? ( kernel-install ) - ukify? ( boot ) - ${PYTHON_REQUIRED_USE} -" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - elibc_musl? ( >=sys-libs/musl-1.2.3 ) - selinux? ( sys-libs/libselinux:0= ) - tmpfiles? ( - acl? ( sys-apps/acl:0= ) - ) - udev? ( - >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl:0= ) - kmod? ( >=sys-apps/kmod-15:0= ) - ) - !udev? ( - >=sys-apps/util-linux-2.30:0= - sys-libs/libcap:0= - virtual/libcrypt:= - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.11 -" - -PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]' - -RDEPEND="${COMMON_DEPEND} - boot? ( !<sys-boot/systemd-boot-250 ) - ukify? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep "${PEFILE_DEPEND}") - ) - tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) - udev? ( - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/floppy - acct-group/input - acct-group/kmem - acct-group/kvm - acct-group/lp - acct-group/render - acct-group/sgx - acct-group/tape - acct-group/tty - acct-group/usb - acct-group/video - !sys-apps/gentoo-systemd-integration - !<sys-fs/udev-250 - !sys-fs/eudev - ) - !sys-apps/systemd -" -PDEPEND=" - udev? ( >=sys-fs/udev-init-scripts-34 ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gperf - dev-util/patchelf - >=sys-apps/coreutils-8.16 - sys-devel/gettext - virtual/pkgconfig - $(python_gen_cond_dep " - dev-python/jinja2[\${PYTHON_USEDEP}] - dev-python/lxml[\${PYTHON_USEDEP}] - boot? ( - >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] - test? ( ${PEFILE_DEPEND} ) - ) - ") -" - -TMPFILES_OPTIONAL=1 -UDEV_OPTIONAL=1 - -QA_EXECSTACK="usr/lib/systemd/boot/efi/*" -QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" - -CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED - ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" - -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then - linux-info_pkg_setup - fi - use boot && secureboot_pkg_setup -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch" - ) - - if use elibc_musl; then - PATCHES+=( - "${WORKDIR}/${MUSL_PATCHSET}" - "${FILESDIR}/musl-efi-wchar.patch" - ) - fi - default -} - -src_configure() { - python_setup - meson-multilib_src_configure -} - -multilib_src_configure() { - local emesonargs=( - # default is developer, bug 918671 - -Dmode=release - -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) - - # Disable all optional features - -Dadm-group=false - -Danalyze=false - -Dapparmor=false - -Daudit=false - -Dbacklight=false - -Dbinfmt=false - -Dbpf-framework=false - -Dbzip2=false - -Dcoredump=false - -Ddbus=false - -Delfutils=false - -Denvironment-d=false - -Dfdisk=false - -Dgcrypt=false - -Dglib=false - -Dgshadow=false - -Dgnutls=false - -Dhibernate=false - -Dhostnamed=false - -Didn=false - -Dima=false - -Dinitrd=false - -Dfirstboot=false - -Dldconfig=false - -Dlibcryptsetup=false - -Dlibcurl=false - -Dlibfido2=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dlocaled=false - -Dlogind=false - -Dlz4=false - -Dmachined=false - -Dmicrohttpd=false - -Dnetworkd=false - -Dnscd=false - -Dnss-myhostname=false - -Dnss-resolve=false - -Dnss-systemd=false - -Doomd=false - -Dopenssl=false - -Dp11kit=false - -Dpam=false - -Dpcre2=false - -Dpolkit=false - -Dportabled=false - -Dpstore=false - -Dpwquality=false - -Drandomseed=false - -Dresolve=false - -Drfkill=false - -Dseccomp=false - -Dsmack=false - -Dsysext=false - -Dtimedated=false - -Dtimesyncd=false - -Dtpm=false - -Dqrencode=false - -Dquotacheck=false - -Duserdb=false - -Dutmp=false - -Dvconsole=false - -Dwheel-group=false - -Dxdg-autostart=false - -Dxkbcommon=false - -Dxz=false - -Dzlib=false - -Dzstd=false - ) - - if use tmpfiles || use udev; then - emesonargs+=( $(meson_native_use_bool acl) ) - else - emesonargs+=( -Dacl=false ) - fi - - if use udev; then - emesonargs+=( $(meson_native_use_bool kmod) ) - else - emesonargs+=( -Dkmod=false ) - fi - - if use elibc_musl; then - # Avoid redefinition of struct ethhdr. - append-cppflags -D__UAPI_DEF_ETHHDR=0 - fi - - if multilib_is_native_abi || use udev; then - meson_src_configure - fi -} - -have_dmi() { - # see dmi_arches in meson.build - case ${CHOST} in - mips64*) - return 1 ;; - aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*) - return 0 ;; - esac - return 1 -} - -multilib_src_compile() { - local targets=() optional_targets=() - if multilib_is_native_abi; then - if use boot; then - local efi_arch= efi_arch_alt= - case ${CHOST} in - aarch64*) efi_arch=aa64 ;; - arm*) efi_arch=arm ;; - loongarch32*) efi_arch=loongarch32 ;; - loongarch64*) efi_arch=loongarch64 ;; - riscv32*) efi_arch=riscv32 ;; - riscv64*) efi_arch=riscv64 ;; - x86_64*) efi_arch=x64 efi_arch_alt=ia32;; - i?86*) efi_arch=ia32 ;; - esac - targets+=( - bootctl - man/bootctl.1 - src/boot/efi/systemd-boot${efi_arch}.efi - src/boot/efi/linux${efi_arch}.efi.stub - src/boot/efi/addon${efi_arch}.efi.stub - ) - if [[ -n ${efi_arch_alt} ]]; then - # If we have a multilib toolchain, meson.build will build the - # "alt" arch (ia32). There's no easy way to detect this, so try - # to build it and ignore failure. - optional_targets+=( - src/boot/efi/systemd-boot${efi_arch_alt}.efi - src/boot/efi/linux${efi_arch_alt}.efi.stub - src/boot/efi/addon${efi_arch_alt}.efi.stub - ) - fi - - fi - if use kernel-install; then - targets+=( - kernel-install - src/kernel-install/90-loaderentry.install - man/kernel-install.8 - ) - fi - if use sysusers; then - targets+=( - systemd-sysusers - man/sysusers.d.5 - man/systemd-sysusers.8 - ) - if use test; then - targets+=( - systemd-runtest.env - ) - fi - fi - if use tmpfiles; then - targets+=( - systemd-tmpfiles - man/tmpfiles.d.5 - man/systemd-tmpfiles.8 - tmpfiles.d/{etc,static-nodes-permissions,var}.conf - ) - if use test; then - targets+=( - test-offline-passwd - test-tmpfile-util - ) - fi - fi - if use udev; then - targets+=( - udevadm - systemd-hwdb - ata_id - cdrom_id - fido_id - iocost - mtd_probe - scsi_id - v4l_id - src/udev/udev.pc - man/udev.conf.5 - man/systemd.link.5 - man/hwdb.7 - man/udev.7 - man/systemd-hwdb.8 - man/systemd-udevd.service.8 - man/udevadm.8 - man/libudev.3 - man/udev_device_get_syspath.3 - man/udev_device_has_tag.3 - man/udev_device_new_from_syspath.3 - man/udev_enumerate_add_match_subsystem.3 - man/udev_enumerate_new.3 - man/udev_enumerate_scan_devices.3 - man/udev_list_entry.3 - man/udev_monitor_filter_update.3 - man/udev_monitor_new_from_netlink.3 - man/udev_monitor_receive_device.3 - man/udev_new.3 - hwdb.d/60-autosuspend-chromiumos.hwdb - rules.d/50-udev-default.rules - rules.d/60-persistent-storage.rules - rules.d/64-btrfs.rules - # Needed for tests - rules.d/99-systemd.rules - ) - if have_dmi; then - targets+=( dmi_memory_id ) - fi - if use test; then - targets+=( - test-fido-id-desc - test-link-config-tables - test-udev-builtin - test-udev-device-thread - test-udev-format - test-udev-manager - test-udev-node - test-udev-rule-runner - test-udev-rules - test-udev-spawn - test-udev-util - ) - fi - fi - if use ukify; then - targets+=( - ukify - src/kernel-install/60-ukify.install - man/ukify.1 - ) - fi - fi - if use udev; then - targets+=( - libudev - src/libudev/libudev.pc - ) - if use test; then - targets+=( - test-libudev - test-libudev-sym - test-udev-device-thread - ) - fi - fi - if [[ ${#targets[@]} -ne 0 ]]; then - meson_src_compile "${targets[@]}" - fi - if [[ ${#optional_targets[@]} -ne 0 ]]; then - ninja ${NINJAOPTS} "${optional_targets[@]}" - fi -} - -multilib_src_test() { - local tests=() - if multilib_is_native_abi; then - if use boot; then - tests+=( --suite boot ) - fi - if use kernel-install; then - tests+=( --suite kernel-install ) - fi - if use sysusers; then - tests+=( --suite sysusers ) - fi - if use tmpfiles; then - tests+=( --suite tmpfiles ) - fi - if use udev; then - tests+=( --suite udev ) - fi - fi - if use udev; then - tests+=( --suite libudev ) - fi - if [[ ${#tests[@]} -ne 0 ]]; then - meson_src_test --no-rebuild "${tests[@]}" - fi -} - -src_install() { - meson-multilib_src_install -} - -set_rpath() { - patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed" -} - -multilib_src_install() { - if multilib_is_native_abi; then - exeinto "/usr/$(get_libdir)/systemd" - doexe src/shared/libsystemd-shared-${PV%%.*}.so - if use boot; then - set_rpath bootctl - dobin bootctl - doman man/bootctl.1 - meson_install --no-rebuild --tags systemd-boot - fi - if use kernel-install; then - set_rpath kernel-install - dobin kernel-install - doman man/kernel-install.8 - exeinto /usr/lib/kernel/install.d - doexe src/kernel-install/*.install - fi - if use sysusers; then - set_rpath systemd-sysusers - dobin systemd-sysusers - doman man/{systemd-sysusers.8,sysusers.d.5} - fi - if use tmpfiles; then - set_rpath systemd-tmpfiles - dobin systemd-tmpfiles - doman man/{systemd-tmpfiles.8,tmpfiles.d.5} - insinto /usr/lib/tmpfiles.d - doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf - fi - if use udev; then - set_rpath udevadm systemd-hwdb - dobin udevadm systemd-hwdb - dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd - if use split-usr; then - # elogind installs udev rules that hard-code /bin/udevadm - dosym ../usr/bin/udevadm /bin/udevadm - fi - - exeinto /usr/lib/udev - set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} - doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} - - if have_dmi; then - set_rpath dmi_memory_id - doexe dmi_memory_id - fi - - rm -f rules.d/99-systemd.rules - insinto /usr/lib/udev/rules.d - doins rules.d/*.rules - - insinto /usr/lib/udev/hwdb.d - doins hwdb.d/*.hwdb - - insinto /usr/share/pkgconfig - doins src/udev/udev.pc - - doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8} - newman man/systemd-udevd.service.8 systemd-udevd.8 - doman man/libudev.3 - doman man/udev_*.3 - fi - if use ukify; then - dobin ukify - dosym ../../bin/ukify /usr/lib/systemd/ukify - doman man/ukify.1 - fi - fi - if use udev; then - meson_install --no-rebuild --tags libudev - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - fi -} - -multilib_src_install_all() { - einstalldocs - if use boot; then - dobashcomp shell-completion/bash/bootctl - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/{_bootctl,_kernel-install} - fi - if use kernel-install; then - exeinto /usr/lib/kernel/install.d - doexe src/kernel-install/*.install - fi - if use tmpfiles; then - doinitd "${FILESDIR}"/systemd-tmpfiles-setup - doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev - exeinto /etc/cron.daily - doexe "${FILESDIR}"/systemd-tmpfiles-clean - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_systemd-tmpfiles - insinto /usr/lib/tmpfiles.d - doins tmpfiles.d/x11.conf - doins "${FILESDIR}"/{legacy,tmp}.conf - fi - if use udev; then - doheader src/libudev/libudev.h - - insinto /etc/udev - doins src/udev/udev.conf - keepdir /etc/udev/{hwdb.d,rules.d} - - insinto /usr/lib/systemd/network - doins network/99-default.link - - # Remove to avoid conflict with elogind - # https://bugs.gentoo.org/856433 - rm rules.d/70-power-switch.rules || die - insinto /usr/lib/udev/rules.d - doins rules.d/*.rules - doins "${FILESDIR}"/40-gentoo.rules - - insinto /usr/lib/udev/hwdb.d - doins hwdb.d/*.hwdb - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - fi - - use ukify && python_fix_shebang "${ED}" - use boot && secureboot_auto_sign -} - -add_service() { - local initd=$1 - local runlevel=$2 - - ebegin "Adding '${initd}' service to the '${runlevel}' runlevel" - mkdir -p "${EROOT}/etc/runlevels/${runlevel}" && - ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" - eend $? -} - -pkg_preinst() { - # Migrate /lib/{systemd,udev} to /usr/lib - if use split-usr; then - local d - for d in systemd udev; do - dosym ../usr/lib/${d} /lib/${d} - if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then - einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'" - cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die - einfo "Removing '${EROOT}/lib/${d}'" - rm -r "${EROOT}/lib/${d}" || die - fi - done - fi -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - add_service systemd-tmpfiles-setup-dev sysinit - add_service systemd-tmpfiles-setup boot - fi - if use udev; then - ebegin "Updating hwdb" - systemd-hwdb --root="${ROOT}" update - eend $? - udev_reload - fi -}