| 1 |
commit: 6b5cd908e67975564a0074dcd13b0d60f53f9daa |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 9 17:30:12 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 9 17:30:12 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5cd908 |
| 7 |
|
| 8 |
sys-fs/udev: remove redundant rules installation |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-fs/udev/udev-249.ebuild | 7 +++---- |
| 13 |
sys-fs/udev/udev-9999.ebuild | 7 +++---- |
| 14 |
2 files changed, 6 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/udev/udev-249.ebuild b/sys-fs/udev/udev-249.ebuild |
| 17 |
index 01117409e7f..d23c86c0aeb 100644 |
| 18 |
--- a/sys-fs/udev/udev-249.ebuild |
| 19 |
+++ b/sys-fs/udev/udev-249.ebuild |
| 20 |
@@ -184,9 +184,9 @@ multilib_src_install() { |
| 21 |
exeinto /lib/udev |
| 22 |
doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} |
| 23 |
|
| 24 |
+ # Install generated rules (${BUILD_DIR}/rules.d/*.rules) |
| 25 |
insinto /lib/udev/rules.d |
| 26 |
doins rules.d/*.rules |
| 27 |
- doins "${S}"/rules.d/*.rules |
| 28 |
|
| 29 |
insinto /usr/share/pkgconfig |
| 30 |
doins src/udev/udev.pc |
| 31 |
@@ -207,11 +207,10 @@ multilib_src_install_all() { |
| 32 |
insinto /lib/systemd/network |
| 33 |
doins network/99-default.link |
| 34 |
|
| 35 |
- # see src_prepare() for content of 40-gentoo.rules |
| 36 |
+ # Install static rules (${S}/rules.d/*.rules) |
| 37 |
insinto /lib/udev/rules.d |
| 38 |
- doins "${FILESDIR}"/40-gentoo.rules |
| 39 |
- doins "${S}"/rules.d/*.rules |
| 40 |
doins rules.d/*.rules |
| 41 |
+ doins "${FILESDIR}"/40-gentoo.rules |
| 42 |
|
| 43 |
dobashcomp shell-completion/bash/udevadm |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 47 |
index 01117409e7f..d23c86c0aeb 100644 |
| 48 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 49 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 50 |
@@ -184,9 +184,9 @@ multilib_src_install() { |
| 51 |
exeinto /lib/udev |
| 52 |
doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} |
| 53 |
|
| 54 |
+ # Install generated rules (${BUILD_DIR}/rules.d/*.rules) |
| 55 |
insinto /lib/udev/rules.d |
| 56 |
doins rules.d/*.rules |
| 57 |
- doins "${S}"/rules.d/*.rules |
| 58 |
|
| 59 |
insinto /usr/share/pkgconfig |
| 60 |
doins src/udev/udev.pc |
| 61 |
@@ -207,11 +207,10 @@ multilib_src_install_all() { |
| 62 |
insinto /lib/systemd/network |
| 63 |
doins network/99-default.link |
| 64 |
|
| 65 |
- # see src_prepare() for content of 40-gentoo.rules |
| 66 |
+ # Install static rules (${S}/rules.d/*.rules) |
| 67 |
insinto /lib/udev/rules.d |
| 68 |
- doins "${FILESDIR}"/40-gentoo.rules |
| 69 |
- doins "${S}"/rules.d/*.rules |
| 70 |
doins rules.d/*.rules |
| 71 |
+ doins "${FILESDIR}"/40-gentoo.rules |
| 72 |
|
| 73 |
dobashcomp shell-completion/bash/udevadm |
Archives