1 |
commit: 1d3fa1bd451c4112c82d7e5b024abddef76ad6d0 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 25 01:46:30 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 28 19:54:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3fa1bd |
7 |
|
8 |
sys-apps/systemd: install bundled hwdb data |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
...systemd-9999.ebuild => systemd-249.6-r1.ebuild} | 32 +++------------------- |
13 |
sys-apps/systemd/systemd-9999.ebuild | 17 +++--------- |
14 |
2 files changed, 8 insertions(+), 41 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-249.6-r1.ebuild |
17 |
similarity index 93% |
18 |
copy from sys-apps/systemd/systemd-9999.ebuild |
19 |
copy to sys-apps/systemd/systemd-249.6-r1.ebuild |
20 |
index 7f2653050c1c..5f4dc1168d11 100644 |
21 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
22 |
+++ b/sys-apps/systemd/systemd-249.6-r1.ebuild |
23 |
@@ -30,12 +30,11 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
24 |
|
25 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
26 |
SLOT="0/2" |
27 |
-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" |
28 |
+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" |
29 |
|
30 |
REQUIRED_USE=" |
31 |
homed? ( cryptsetup pam ) |
32 |
importd? ( curl gcrypt lzma ) |
33 |
- policykit? ( !hostnamed-fallback ) |
34 |
pwquality? ( homed ) |
35 |
" |
36 |
RESTRICT="!test? ( test )" |
37 |
@@ -118,10 +117,6 @@ RDEPEND="${COMMON_DEPEND} |
38 |
>=acct-user/systemd-resolve-0-r1 |
39 |
>=acct-user/systemd-timesync-0-r1 |
40 |
>=sys-apps/baselayout-2.2 |
41 |
- hostnamed-fallback? ( |
42 |
- acct-group/systemd-hostname |
43 |
- sys-apps/dbus-broker |
44 |
- ) |
45 |
selinux? ( sec-policy/selinux-base-policy[systemd] ) |
46 |
sysv-utils? ( |
47 |
!sys-apps/openrc[sysv-utils(-)] |
48 |
@@ -134,6 +129,7 @@ RDEPEND="${COMMON_DEPEND} |
49 |
sys-process/procps[kill(+)] |
50 |
sys-apps/coreutils[kill(-)] |
51 |
) ) |
52 |
+ !sys-apps/hwids[udev] |
53 |
!sys-auth/nss-myhostname |
54 |
!sys-fs/eudev |
55 |
!sys-fs/udev |
56 |
@@ -141,7 +137,6 @@ RDEPEND="${COMMON_DEPEND} |
57 |
|
58 |
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) |
59 |
PDEPEND=">=sys-apps/dbus-1.9.8[systemd] |
60 |
- hwdb? ( sys-apps/hwids[systemd(+),udev] ) |
61 |
>=sys-fs/udev-init-scripts-34 |
62 |
policykit? ( sys-auth/polkit ) |
63 |
!vanilla? ( sys-apps/gentoo-systemd-integration )" |
64 |
@@ -291,7 +286,6 @@ multilib_src_configure() { |
65 |
-Defi-ld="$(tc-getLD)" |
66 |
-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" |
67 |
$(meson_native_use_bool homed) |
68 |
- $(meson_native_use_bool hwdb) |
69 |
$(meson_native_use_bool http microhttpd) |
70 |
$(meson_native_use_bool idn) |
71 |
$(meson_native_use_bool importd) |
72 |
@@ -384,9 +378,7 @@ multilib_src_install_all() { |
73 |
keepdir /etc/systemd/{network,system,user} |
74 |
keepdir /etc/udev/rules.d |
75 |
|
76 |
- if use hwdb; then |
77 |
- keepdir /etc/udev/hwdb.d |
78 |
- fi |
79 |
+ keepdir /etc/udev/hwdb.d |
80 |
|
81 |
keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} |
82 |
keepdir /usr/lib/{binfmt.d,modules-load.d} |
83 |
@@ -401,26 +393,12 @@ multilib_src_install_all() { |
84 |
newpamd "${FILESDIR}"/systemd-user.pam systemd-user |
85 |
fi |
86 |
|
87 |
- if use hwdb; then |
88 |
- rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die |
89 |
- fi |
90 |
- |
91 |
if use split-usr; then |
92 |
# Avoid breaking boot/reboot |
93 |
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd |
94 |
dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown |
95 |
fi |
96 |
|
97 |
- # workaround for https://github.com/systemd/systemd/issues/13501 |
98 |
- if use hostnamed-fallback; then |
99 |
- # this file requires dbus-broker |
100 |
- insinto /usr/share/dbus-1/system.d/ |
101 |
- doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" |
102 |
- |
103 |
- insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" |
104 |
- doins "${FILESDIR}/00-hostnamed-network-user.conf" |
105 |
- fi |
106 |
- |
107 |
gen_usr_ldscript -a systemd udev |
108 |
} |
109 |
|
110 |
@@ -491,9 +469,7 @@ pkg_postinst() { |
111 |
|
112 |
# Keep this here in case the database format changes so it gets updated |
113 |
# when required. |
114 |
- if use hwdb; then |
115 |
- systemd-hwdb --root="${ROOT}" update |
116 |
- fi |
117 |
+ systemd-hwdb --root="${ROOT}" update |
118 |
|
119 |
udev_reload || FAIL=1 |
120 |
|
121 |
|
122 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
123 |
index 7f2653050c1c..b422ee6c0681 100644 |
124 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
125 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
126 |
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
127 |
|
128 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
129 |
SLOT="0/2" |
130 |
-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" |
131 |
+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" |
132 |
|
133 |
REQUIRED_USE=" |
134 |
homed? ( cryptsetup pam ) |
135 |
@@ -134,6 +134,7 @@ RDEPEND="${COMMON_DEPEND} |
136 |
sys-process/procps[kill(+)] |
137 |
sys-apps/coreutils[kill(-)] |
138 |
) ) |
139 |
+ !sys-apps/hwids[udev] |
140 |
!sys-auth/nss-myhostname |
141 |
!sys-fs/eudev |
142 |
!sys-fs/udev |
143 |
@@ -141,7 +142,6 @@ RDEPEND="${COMMON_DEPEND} |
144 |
|
145 |
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) |
146 |
PDEPEND=">=sys-apps/dbus-1.9.8[systemd] |
147 |
- hwdb? ( sys-apps/hwids[systemd(+),udev] ) |
148 |
>=sys-fs/udev-init-scripts-34 |
149 |
policykit? ( sys-auth/polkit ) |
150 |
!vanilla? ( sys-apps/gentoo-systemd-integration )" |
151 |
@@ -291,7 +291,6 @@ multilib_src_configure() { |
152 |
-Defi-ld="$(tc-getLD)" |
153 |
-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" |
154 |
$(meson_native_use_bool homed) |
155 |
- $(meson_native_use_bool hwdb) |
156 |
$(meson_native_use_bool http microhttpd) |
157 |
$(meson_native_use_bool idn) |
158 |
$(meson_native_use_bool importd) |
159 |
@@ -384,9 +383,7 @@ multilib_src_install_all() { |
160 |
keepdir /etc/systemd/{network,system,user} |
161 |
keepdir /etc/udev/rules.d |
162 |
|
163 |
- if use hwdb; then |
164 |
- keepdir /etc/udev/hwdb.d |
165 |
- fi |
166 |
+ keepdir /etc/udev/hwdb.d |
167 |
|
168 |
keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} |
169 |
keepdir /usr/lib/{binfmt.d,modules-load.d} |
170 |
@@ -401,10 +398,6 @@ multilib_src_install_all() { |
171 |
newpamd "${FILESDIR}"/systemd-user.pam systemd-user |
172 |
fi |
173 |
|
174 |
- if use hwdb; then |
175 |
- rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die |
176 |
- fi |
177 |
- |
178 |
if use split-usr; then |
179 |
# Avoid breaking boot/reboot |
180 |
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd |
181 |
@@ -491,9 +484,7 @@ pkg_postinst() { |
182 |
|
183 |
# Keep this here in case the database format changes so it gets updated |
184 |
# when required. |
185 |
- if use hwdb; then |
186 |
- systemd-hwdb --root="${ROOT}" update |
187 |
- fi |
188 |
+ systemd-hwdb --root="${ROOT}" update |
189 |
|
190 |
udev_reload || FAIL=1 |