[gentoo-commits] proj/eudev:master commit in: rules/

[Anthony G. Basile]

commit: 9a240b197b18ffdc3ca5da83ac45bcc9b82a1344
Author: Yann Dirson  blade-group  com>
AuthorDate: Thu Jan  7 09:30:08 2021 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jan 14 17:52:26 2021 +
URL:https://gitweb.gentoo.org/proj/eudev.git/commit/?id=9a240b19

Revert bad 78-sound-card.rules update causing path_id skip

The following device properly got assigned ID_PATH with eudev 3.2.1,
but does not get it any more with recent versions:

P: /devices/platform/rt5651-sound/sound/card0
E: DEVPATH=/devices/platform/rt5651-sound/sound/card0
E: SOUND_FORM_FACTOR=internal
E: SOUND_INITIALIZED=1
E: SUBSYSTEM=sound
E: USEC_INITIALIZED=507638688065

This results in pulseaudio giving a non-stable card name by using a
device number.

I tracked the problem to commit
47367bc4df6f05a49cf4b5b0209153d77a9ade83, which changed (without
explaining why it does so) the rules for "internal" sound cards,
notably preventing `IMPORT{builtin}="path_id"` from being reached.

Signed-off-by: Yann Dirson  blade-group.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 rules/78-sound-card.rules | 5 -
 1 file changed, 5 deletions(-)

diff --git a/rules/78-sound-card.rules b/rules/78-sound-card.rules
index f2fc27739..3a626e146 100644
--- a/rules/78-sound-card.rules
+++ b/rules/78-sound-card.rules
@@ -50,11 +50,6 @@ SUBSYSTEMS=="firewire", GOTO="skip_pci"
 SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", 
ENV{ID_MODEL_ID}="$attr{device}"
 SUBSYSTEMS=="pci", GOTO="skip_pci"
 
-# If we reach here, the device nor any of its parents are USB/PCI/firewire bus 
devices.
-# If we now find a parent that is a platform device, assume that we're working 
with
-# an internal sound card.
-SUBSYSTEMS=="platform", ENV{SOUND_FORM_FACTOR}="internal", GOTO="sound_end"
-
 LABEL="skip_pci"
 
 # Define ID_ID if ID_BUS and ID_SERIAL are set. This will work for both

[gentoo-commits] proj/eudev:master commit in: rules/, /

[Anthony G. Basile]

commit: 941d20bce37b304215817e93e3d98d3018fc847b
Author: Marius Bakke  devup  no>
AuthorDate: Thu Apr  9 10:47:44 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Apr 10 13:26:02 2020 +
URL:https://gitweb.gentoo.org/proj/eudev.git/commit/?id=941d20bc

rules/64-btrfs.rules: Expand @bindir@ to the absolute directory name.

This fixes #182 by ensuring @bindir@ is fully expanded at installation
time.  See "Installation Directory Variables" in the GNU Autoconf
manual, in particular the note about AC_CONFIG_FILES.

Signed-off-by: Anthony G. Basile  gentoo.org>

 configure.ac  | 1 -
 rules/Makefile.am | 6 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9ba4f124e..fda10eac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,6 @@ AC_CONFIG_FILES([Makefile
  rule_generator/Makefile
  rule_generator/write_net_rules
  rules/Makefile
- rules/64-btrfs.rules
  src/Makefile
  src/ata_id/Makefile
  src/cdrom_id/Makefile

diff --git a/rules/Makefile.am b/rules/Makefile.am
index 4c8758426..6143851a9 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -43,5 +43,11 @@ dist_udevrules_DATA += \
75-probe_mtd.rules
 endif
 
+do_subst = $(SED) \
+   -e 's,[@]bindir[@],$(bindir),g'
+
+64-btrfs.rules: 64-btrfs.rules.in Makefile
+   $(do_subst) < $< > $@
+
 install-data-local:
$(MKDIR_P) $(DESTDIR)$(udevconfdir)/rules.d