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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7838E138350 for ; Wed, 15 Apr 2020 18:51:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73A8FE092F; Wed, 15 Apr 2020 18:51:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4210FE092F for ; Wed, 15 Apr 2020 18:51:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 019F234F23F for ; Wed, 15 Apr 2020 18:51:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70D9871 for ; Wed, 15 Apr 2020 18:51:52 +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: <1586976671.63bcd10168ea9503b0543610836de51fa25e7d3d.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-245-r2.ebuild sys-apps/systemd/systemd-245-r3.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: 63bcd10168ea9503b0543610836de51fa25e7d3d X-VCS-Branch: master Date: Wed, 15 Apr 2020 18:51:52 +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: 0d720098-f5b8-4aa0-9bb9-b139d8979628 X-Archives-Hash: aba13774bb21f627a36c2d1c4e898be4 commit: 63bcd10168ea9503b0543610836de51fa25e7d3d Author: Jakov Smolic sartura hr> AuthorDate: Mon Apr 13 16:11:34 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Apr 15 18:51:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bcd101 sys-apps/systemd: add hwdb USE flag Enables building systemd without hwdb, which saves approx. 10 kB of space. Furthermore, sys-apps/hwids dependancy is dropped if hwdb support is turned off, which saves additional 15 MB of space. Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Josip Kelecic sartura.hr> Signed-off-by: Jakov Petrina sartura.hr> Signed-off-by: Luka Perkov sartura.hr> Signed-off-by: Mike Gilbert gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/15354 sys-apps/systemd/metadata.xml | 1 + .../{systemd-245-r2.ebuild => systemd-245-r3.ebuild} | 17 ++++++++++++----- sys-apps/systemd/systemd-9999.ebuild | 17 ++++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 336245a670a..897107ece0c 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -20,6 +20,7 @@ Enable sealing of journal files using gcrypt Enable portable home directories Enable embedded HTTP server in journald + Enable control over hwdb Enable import daemon Enable kernel module loading via sys-apps/kmod Enable lz4 compression for the journal diff --git a/sys-apps/systemd/systemd-245-r2.ebuild b/sys-apps/systemd/systemd-245-r3.ebuild similarity index 96% rename from sys-apps/systemd/systemd-245-r2.ebuild rename to sys-apps/systemd/systemd-245-r3.ebuild index 6b80478fa7e..0fd4ff855ec 100644 --- a/sys-apps/systemd/systemd-245-r2.ebuild +++ b/sys-apps/systemd/systemd-245-r3.ebuild @@ -28,7 +28,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 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" REQUIRED_USE=" homed? ( cryptsetup ) @@ -119,7 +119,7 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-apps/hwids-20150417[udev] + hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" @@ -275,6 +275,7 @@ multilib_src_configure() { -Dgnu-efi=$(meson_multilib_native_use gnuefi) -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dhomed=$(meson_multilib_native_use homed) + -Dhwdb=$(meson_multilib_native_use hwdb) -Dmicrohttpd=$(meson_multilib_native_use http) -Didn=$(meson_multilib_native_use idn) -Dimportd=$(meson_multilib_native_use importd) @@ -308,7 +309,6 @@ multilib_src_configure() { -Dfirstboot=$(meson_multilib) -Dhibernate=$(meson_multilib) -Dhostnamed=$(meson_multilib) - -Dhwdb=$(meson_multilib) -Dldconfig=$(meson_multilib) -Dlocaled=$(meson_multilib) -Dman=$(meson_multilib) @@ -370,7 +370,12 @@ multilib_src_install_all() { keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} keepdir /etc/kernel/install.d keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/{hwdb.d,rules.d} + keepdir /etc/udev/rules.d + + if use hwdb; then + keepdir /etc/udev/hwdb.d + fi + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} keepdir /usr/lib/{binfmt.d,modules-load.d} keepdir /usr/lib/systemd/user-generators @@ -380,7 +385,9 @@ multilib_src_install_all() { # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + if use hwdb; then + rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + fi if use split-usr; then # Avoid breaking boot/reboot diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index c35e623d94d..79adf7db45a 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -28,7 +28,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 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb" REQUIRED_USE=" homed? ( cryptsetup ) @@ -119,7 +119,7 @@ RDEPEND="${COMMON_DEPEND} # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.9.8[systemd] - >=sys-apps/hwids-20150417[udev] + hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )" @@ -274,6 +274,7 @@ multilib_src_configure() { -Dgnu-efi=$(meson_multilib_native_use gnuefi) -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dhomed=$(meson_multilib_native_use homed) + -Dhwdb=$(meson_multilib_native_use hwdb) -Dmicrohttpd=$(meson_multilib_native_use http) -Didn=$(meson_multilib_native_use idn) -Dimportd=$(meson_multilib_native_use importd) @@ -307,7 +308,6 @@ multilib_src_configure() { -Dfirstboot=$(meson_multilib) -Dhibernate=$(meson_multilib) -Dhostnamed=$(meson_multilib) - -Dhwdb=$(meson_multilib) -Dldconfig=$(meson_multilib) -Dlocaled=$(meson_multilib) -Dman=$(meson_multilib) @@ -369,7 +369,12 @@ multilib_src_install_all() { keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} keepdir /etc/kernel/install.d keepdir /etc/systemd/{network,system,user} - keepdir /etc/udev/{hwdb.d,rules.d} + keepdir /etc/udev/rules.d + + if use hwdb; then + keepdir /etc/udev/hwdb.d + fi + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} keepdir /usr/lib/{binfmt.d,modules-load.d} keepdir /usr/lib/systemd/user-generators @@ -379,7 +384,9 @@ multilib_src_install_all() { # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + if use hwdb; then + rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + fi if use split-usr; then # Avoid breaking boot/reboot