| 1 |
commit: 7cd8b5ff80da9162861e528df29eceaddc282110 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 25 01:54:40 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 28 19:54:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd8b5ff |
| 7 |
|
| 8 |
sys-fs/udev: install bundled hwdb data |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-fs/udev/{udev-249.6.ebuild => udev-249.6-r1.ebuild} | 11 +++++++++-- |
| 13 |
sys-fs/udev/udev-9999.ebuild | 11 +++++++++-- |
| 14 |
2 files changed, 18 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/udev/udev-249.6.ebuild b/sys-fs/udev/udev-249.6-r1.ebuild |
| 17 |
similarity index 97% |
| 18 |
rename from sys-fs/udev/udev-249.6.ebuild |
| 19 |
rename to sys-fs/udev/udev-249.6-r1.ebuild |
| 20 |
index b42753db0add..cc70f84d4598 100644 |
| 21 |
--- a/sys-fs/udev/udev-249.6.ebuild |
| 22 |
+++ b/sys-fs/udev/udev-249.6-r1.ebuild |
| 23 |
@@ -83,9 +83,11 @@ RDEPEND="${COMMON_DEPEND} |
| 24 |
acct-group/video |
| 25 |
!sys-apps/gentoo-systemd-integration |
| 26 |
!sys-apps/systemd |
| 27 |
+ !sys-apps/hwids[udev] |
| 28 |
+" |
| 29 |
+PDEPEND=" |
| 30 |
+ >=sys-fs/udev-init-scripts-34 |
| 31 |
" |
| 32 |
-PDEPEND=">=sys-apps/hwids-20140304[udev] |
| 33 |
- >=sys-fs/udev-init-scripts-34" |
| 34 |
|
| 35 |
python_check_deps() { |
| 36 |
has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" |
| 37 |
@@ -185,6 +187,7 @@ multilib_src_compile() { |
| 38 |
man/udev.7 |
| 39 |
man/systemd-udevd.service.8 |
| 40 |
man/udevadm.8 |
| 41 |
+ hwdb.d/60-autosuspend-chromiumos.hwdb |
| 42 |
rules.d/50-udev-default.rules |
| 43 |
rules.d/64-btrfs.rules |
| 44 |
) |
| 45 |
@@ -239,6 +242,8 @@ multilib_src_install() { |
| 46 |
# Install generated rules (${BUILD_DIR}/rules.d/*.rules) |
| 47 |
insinto /lib/udev/rules.d |
| 48 |
doins rules.d/*.rules |
| 49 |
+ insinto /lib/udev/hwdb.d |
| 50 |
+ doins hwdb.d/*.hwdb |
| 51 |
|
| 52 |
insinto /usr/share/pkgconfig |
| 53 |
doins src/udev/udev.pc |
| 54 |
@@ -263,6 +268,8 @@ multilib_src_install_all() { |
| 55 |
insinto /lib/udev/rules.d |
| 56 |
doins rules.d/*.rules |
| 57 |
doins "${FILESDIR}"/40-gentoo.rules |
| 58 |
+ insinto /lib/udev/hwdb.d |
| 59 |
+ doins hwdb.d/*.hwdb |
| 60 |
|
| 61 |
dobashcomp shell-completion/bash/udevadm |
| 62 |
|
| 63 |
|
| 64 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 65 |
index fc79e4aaa550..3b56e4e1f8ea 100644 |
| 66 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 67 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 68 |
@@ -83,9 +83,11 @@ RDEPEND="${COMMON_DEPEND} |
| 69 |
acct-group/video |
| 70 |
!sys-apps/gentoo-systemd-integration |
| 71 |
!sys-apps/systemd |
| 72 |
+ !sys-apps/hwids[udev] |
| 73 |
+" |
| 74 |
+PDEPEND=" |
| 75 |
+ >=sys-fs/udev-init-scripts-34 |
| 76 |
" |
| 77 |
-PDEPEND=">=sys-apps/hwids-20140304[udev] |
| 78 |
- >=sys-fs/udev-init-scripts-34" |
| 79 |
|
| 80 |
python_check_deps() { |
| 81 |
has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" |
| 82 |
@@ -185,6 +187,7 @@ multilib_src_compile() { |
| 83 |
man/udev.7 |
| 84 |
man/systemd-udevd.service.8 |
| 85 |
man/udevadm.8 |
| 86 |
+ hwdb.d/60-autosuspend-chromiumos.hwdb |
| 87 |
rules.d/50-udev-default.rules |
| 88 |
rules.d/64-btrfs.rules |
| 89 |
) |
| 90 |
@@ -239,6 +242,8 @@ multilib_src_install() { |
| 91 |
# Install generated rules (${BUILD_DIR}/rules.d/*.rules) |
| 92 |
insinto /lib/udev/rules.d |
| 93 |
doins rules.d/*.rules |
| 94 |
+ insinto /lib/udev/hwdb.d |
| 95 |
+ doins hwdb.d/*.hwdb |
| 96 |
|
| 97 |
insinto /usr/share/pkgconfig |
| 98 |
doins src/udev/udev.pc |
| 99 |
@@ -263,6 +268,8 @@ multilib_src_install_all() { |
| 100 |
insinto /lib/udev/rules.d |
| 101 |
doins rules.d/*.rules |
| 102 |
doins "${FILESDIR}"/40-gentoo.rules |
| 103 |
+ insinto /lib/udev/hwdb.d |
| 104 |
+ doins hwdb.d/*.hwdb |
| 105 |
|
| 106 |
dobashcomp shell-completion/bash/udevadm |
Archives