| 1 |
commit: c547cecbf6d46f399bb1ec5b360b8e4a0cde1b7c |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 4 20:42:46 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 4 20:44:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c547cecb |
| 7 |
|
| 8 |
sys-apps/systemd-utils: do not install 70-power-switch.rules |
| 9 |
|
| 10 |
In meson, this is gated behind enable_logind. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/856433 |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
...md-utils-251.2.ebuild => systemd-utils-251.2-r1.ebuild} | 14 ++++++++++++++ |
| 16 |
1 file changed, 14 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from sys-apps/systemd-utils/systemd-utils-251.2.ebuild |
| 21 |
rename to sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild |
| 22 |
index 6d6a29224efa..357c32eb616c 100644 |
| 23 |
--- a/sys-apps/systemd-utils/systemd-utils-251.2.ebuild |
| 24 |
+++ b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild |
| 25 |
@@ -419,14 +419,19 @@ multilib_src_install() { |
| 26 |
into / |
| 27 |
dobin udevadm systemd-hwdb |
| 28 |
dosym ../../bin/udevadm /lib/systemd/systemd-udevd |
| 29 |
+ |
| 30 |
exeinto /lib/udev |
| 31 |
doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} |
| 32 |
+ |
| 33 |
insinto /lib/udev/rules.d |
| 34 |
doins rules.d/*.rules |
| 35 |
+ |
| 36 |
insinto /lib/udev/hwdb.d |
| 37 |
doins hwdb.d/*.hwdb |
| 38 |
+ |
| 39 |
insinto /usr/share/pkgconfig |
| 40 |
doins src/udev/udev.pc |
| 41 |
+ |
| 42 |
doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8} |
| 43 |
newman man/systemd-udevd.service.8 systemd-udevd.8 |
| 44 |
fi |
| 45 |
@@ -457,17 +462,26 @@ multilib_src_install_all() { |
| 46 |
fi |
| 47 |
if use udev; then |
| 48 |
doheader src/libudev/libudev.h |
| 49 |
+ |
| 50 |
insinto /etc/udev |
| 51 |
doins src/udev/udev.conf |
| 52 |
keepdir /etc/udev/{hwdb.d,rules.d} |
| 53 |
+ |
| 54 |
insinto /lib/systemd/network |
| 55 |
doins network/99-default.link |
| 56 |
+ |
| 57 |
+ # Remove to avoid conflict with elogind |
| 58 |
+ # https://bugs.gentoo.org/856433 |
| 59 |
+ rm rules.d/70-power-switch.rules || die |
| 60 |
insinto /lib/udev/rules.d |
| 61 |
doins rules.d/*.rules |
| 62 |
doins "${FILESDIR}"/40-gentoo.rules |
| 63 |
+ |
| 64 |
insinto /lib/udev/hwdb.d |
| 65 |
doins hwdb.d/*.hwdb |
| 66 |
+ |
| 67 |
dobashcomp shell-completion/bash/udevadm |
| 68 |
+ |
| 69 |
insinto /usr/share/zsh/site-functions |
| 70 |
doins shell-completion/zsh/_udevadm |
| 71 |
fi |
Archives