From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD94D13933E for ; Fri, 9 Jul 2021 17:31:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F466E09E1; Fri, 9 Jul 2021 17:31:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00D58E09E1 for ; Fri, 9 Jul 2021 17:31:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3B3233E622 for ; Fri, 9 Jul 2021 17:31:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E12B581 for ; Fri, 9 Jul 2021 17:31:04 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1625851812.6b5cd908e67975564a0074dcd13b0d60f53f9daa.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udev/udev-249.ebuild sys-fs/udev/udev-9999.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6b5cd908e67975564a0074dcd13b0d60f53f9daa X-VCS-Branch: master Date: Fri, 9 Jul 2021 17:31:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b79733a-1d1b-4258-9c45-6a54a823e756 X-Archives-Hash: 40c422a7d1bebb2ee2fa4b885d880329 commit: 6b5cd908e67975564a0074dcd13b0d60f53f9daa Author: Mike Gilbert gentoo org> AuthorDate: Fri Jul 9 17:30:12 2021 +0000 Commit: Mike Gilbert gentoo 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 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