| 1 |
commit: 61b3d2ebb4de957a0cc8cd08795f3547834b9f1e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 20 16:27:45 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 20 17:18:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b3d2eb |
| 7 |
|
| 8 |
sys-apps/systemd: call systemd-hwdb update |
| 9 |
|
| 10 |
... instead of udevadm hwdb --update |
| 11 |
|
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/systemd/systemd-9999.ebuild | 8 ++++---- |
| 15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 18 |
index 8dd85417f98..3f2168e521b 100644 |
| 19 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 20 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 21 |
@@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND} |
| 22 |
|
| 23 |
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) |
| 24 |
PDEPEND=">=sys-apps/dbus-1.9.8[systemd] |
| 25 |
- hwdb? ( >=sys-apps/hwids-20150417[udev] ) |
| 26 |
+ hwdb? ( sys-apps/hwids[systemd(+),udev] ) |
| 27 |
>=sys-fs/udev-init-scripts-34 |
| 28 |
policykit? ( sys-auth/polkit ) |
| 29 |
!vanilla? ( sys-apps/gentoo-systemd-integration )" |
| 30 |
@@ -459,9 +459,9 @@ pkg_postinst() { |
| 31 |
systemd_update_catalog |
| 32 |
|
| 33 |
# Keep this here in case the database format changes so it gets updated |
| 34 |
- # when required. Despite that this file is owned by sys-apps/hwids. |
| 35 |
- if has_version "sys-apps/hwids[udev]"; then |
| 36 |
- udevadm hwdb --update --root="${EROOT}" |
| 37 |
+ # when required. |
| 38 |
+ if use hwdb; then |
| 39 |
+ systemd-hwdb --root="${ROOT}" update |
| 40 |
fi |
| 41 |
|
| 42 |
udev_reload || FAIL=1 |
Archives