[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/

[Mike Gilbert]

commit:     6b5cd908e67975564a0074dcd13b0d60f53f9daa
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  9 17:30:12 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jul  9 17:30:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5cd908

sys-fs/udev: remove redundant rules installation

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/udev/udev-249.ebuild  | 7 +++----
 sys-fs/udev/udev-9999.ebuild | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys-fs/udev/udev-249.ebuild b/sys-fs/udev/udev-249.ebuild
index 01117409e7f..d23c86c0aeb 100644
--- a/sys-fs/udev/udev-249.ebuild
+++ b/sys-fs/udev/udev-249.ebuild
@@ -184,9 +184,9 @@ multilib_src_install() {
                exeinto /lib/udev
                doexe 
src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
 
+               # Install generated rules (${BUILD_DIR}/rules.d/*.rules)
                insinto /lib/udev/rules.d
                doins rules.d/*.rules
-               doins "${S}"/rules.d/*.rules
 
                insinto /usr/share/pkgconfig
                doins src/udev/udev.pc
@@ -207,11 +207,10 @@ multilib_src_install_all() {
        insinto /lib/systemd/network
        doins network/99-default.link
 
-       # see src_prepare() for content of 40-gentoo.rules
+       # Install static rules (${S}/rules.d/*.rules)
        insinto /lib/udev/rules.d
-       doins "${FILESDIR}"/40-gentoo.rules
-       doins "${S}"/rules.d/*.rules
        doins rules.d/*.rules
+       doins "${FILESDIR}"/40-gentoo.rules
 
        dobashcomp shell-completion/bash/udevadm
 

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 01117409e7f..d23c86c0aeb 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -184,9 +184,9 @@ multilib_src_install() {
                exeinto /lib/udev
                doexe 
src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
 
+               # Install generated rules (${BUILD_DIR}/rules.d/*.rules)
                insinto /lib/udev/rules.d
                doins rules.d/*.rules
-               doins "${S}"/rules.d/*.rules
 
                insinto /usr/share/pkgconfig
                doins src/udev/udev.pc
@@ -207,11 +207,10 @@ multilib_src_install_all() {
        insinto /lib/systemd/network
        doins network/99-default.link
 
-       # see src_prepare() for content of 40-gentoo.rules
+       # Install static rules (${S}/rules.d/*.rules)
        insinto /lib/udev/rules.d
-       doins "${FILESDIR}"/40-gentoo.rules
-       doins "${S}"/rules.d/*.rules
        doins rules.d/*.rules
+       doins "${FILESDIR}"/40-gentoo.rules
 
        dobashcomp shell-completion/bash/udevadm