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 AB2E1158086 for ; Sun, 28 Nov 2021 20:09:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37BC72BC062; Sun, 28 Nov 2021 20:09:02 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07AE62BC062 for ; Sun, 28 Nov 2021 20:09:02 +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 F03BA342E68 for ; Sun, 28 Nov 2021 20:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55A68219 for ; Sun, 28 Nov 2021 20:08:56 +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: <1638129248.1d3fa1bd451c4112c82d7e5b024abddef76ad6d0.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-249.6-r1.ebuild 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: 1d3fa1bd451c4112c82d7e5b024abddef76ad6d0 X-VCS-Branch: master Date: Sun, 28 Nov 2021 20:08:56 +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: bf8b24a9-f66a-4748-b9dd-d0d887641861 X-Archives-Hash: 31a430cd4af5676bc295e3f7e56249dc commit: 1d3fa1bd451c4112c82d7e5b024abddef76ad6d0 Author: Mike Gilbert gentoo org> AuthorDate: Thu Nov 25 01:46:30 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 28 19:54:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3fa1bd sys-apps/systemd: install bundled hwdb data Signed-off-by: Mike Gilbert gentoo.org> ...systemd-9999.ebuild => systemd-249.6-r1.ebuild} | 32 +++------------------- sys-apps/systemd/systemd-9999.ebuild | 17 +++--------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-249.6-r1.ebuild similarity index 93% copy from sys-apps/systemd/systemd-9999.ebuild copy to sys-apps/systemd/systemd-249.6-r1.ebuild index 7f2653050c1c..5f4dc1168d11 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-249.6-r1.ebuild @@ -30,12 +30,11 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed hostnamed-fallback http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" REQUIRED_USE=" homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) - policykit? ( !hostnamed-fallback ) pwquality? ( homed ) " RESTRICT="!test? ( test )" @@ -118,10 +117,6 @@ RDEPEND="${COMMON_DEPEND} >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 - hostnamed-fallback? ( - acct-group/systemd-hostname - sys-apps/dbus-broker - ) selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] @@ -134,6 +129,7 @@ RDEPEND="${COMMON_DEPEND} sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev @@ -141,7 +137,6 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( sys-apps/hwids[systemd(+),udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" @@ -291,7 +286,6 @@ multilib_src_configure() { -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" $(meson_native_use_bool homed) - $(meson_native_use_bool hwdb) $(meson_native_use_bool http microhttpd) $(meson_native_use_bool idn) $(meson_native_use_bool importd) @@ -384,9 +378,7 @@ multilib_src_install_all() { keepdir /etc/systemd/{network,system,user} keepdir /etc/udev/rules.d - if use hwdb; then - keepdir /etc/udev/hwdb.d - fi + keepdir /etc/udev/hwdb.d keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} keepdir /usr/lib/{binfmt.d,modules-load.d} @@ -401,26 +393,12 @@ multilib_src_install_all() { newpamd "${FILESDIR}"/systemd-user.pam systemd-user fi - if use hwdb; then - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die - fi - if use split-usr; then # Avoid breaking boot/reboot dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown fi - # workaround for https://github.com/systemd/systemd/issues/13501 - if use hostnamed-fallback; then - # this file requires dbus-broker - insinto /usr/share/dbus-1/system.d/ - doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" - - insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" - doins "${FILESDIR}/00-hostnamed-network-user.conf" - fi - gen_usr_ldscript -a systemd udev } @@ -491,9 +469,7 @@ pkg_postinst() { # Keep this here in case the database format changes so it gets updated # when required. - if use hwdb; then - systemd-hwdb --root="${ROOT}" update - fi + systemd-hwdb --root="${ROOT}" update udev_reload || FAIL=1 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 7f2653050c1c..b422ee6c0681 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed hostnamed-fallback http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd" REQUIRED_USE=" homed? ( cryptsetup pam ) @@ -134,6 +134,7 @@ RDEPEND="${COMMON_DEPEND} sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) + !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev @@ -141,7 +142,6 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - hwdb? ( sys-apps/hwids[systemd(+),udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" @@ -291,7 +291,6 @@ multilib_src_configure() { -Defi-ld="$(tc-getLD)" -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" $(meson_native_use_bool homed) - $(meson_native_use_bool hwdb) $(meson_native_use_bool http microhttpd) $(meson_native_use_bool idn) $(meson_native_use_bool importd) @@ -384,9 +383,7 @@ multilib_src_install_all() { keepdir /etc/systemd/{network,system,user} keepdir /etc/udev/rules.d - if use hwdb; then - keepdir /etc/udev/hwdb.d - fi + keepdir /etc/udev/hwdb.d keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} keepdir /usr/lib/{binfmt.d,modules-load.d} @@ -401,10 +398,6 @@ multilib_src_install_all() { newpamd "${FILESDIR}"/systemd-user.pam systemd-user fi - if use hwdb; then - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die - fi - if use split-usr; then # Avoid breaking boot/reboot dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd @@ -491,9 +484,7 @@ pkg_postinst() { # Keep this here in case the database format changes so it gets updated # when required. - if use hwdb; then - systemd-hwdb --root="${ROOT}" update - fi + systemd-hwdb --root="${ROOT}" update udev_reload || FAIL=1