Author: pebender
Date: Sat Dec 6 09:40:12 2008
New Revision: 4054
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/02-minimyth-dev-persistent.rules
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_uid
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-audio.rules.disabled
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-backend.rules.disabled
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lcdproc.rules.disabled
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-x.rules.disabled
Log:
- Moved peristent device links to /dev/persistent.
- Moved many of the persistent device rules to
02-minimyth-dev-persistent.rules
- Added addition persistent device links.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Dec 6
09:40:12 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 61 (2008-12-04):
+Changes since 61 (2008-12-06):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -15,12 +15,12 @@
Modified LCDproc
- Reorganized lcdproc devices names.
- Converted persistent names from device names to device symbolic
links.
- - Moved persistent names into directory /dev/minimyth/lcdproc.
+ - Moved persistent names into directory /dev/persistent.
Modified LIRC
- Reorganized lirc device names.
- Converted persistent names from device names to device symbolic
links.
- - Moved persistent names into directory /dev/minimyth/lirc.
+ - Moved persistent names into directory /dev/persistent.
- Reorganized the /etc/lirc.d directory.
- Renamed some directories to shorten the names:
/etc/lirc.d/driver.conf.d -> /etc/lirc.d/driver.conf
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Sat Dec
6
09:40:12 2008
@@ -2301,7 +2301,7 @@
<p>
When MiniMyth detects a remote control device,
it adds a persistent name for the device
- (/dev/minimyth/lirc/usb:{idVendor}:{idProduct}:{serial})
+
(/dev/persistent/usb:{idVendor}:{idProduct}:{serial}):{bInterfaceNumber}
when possible.
Since this persistent name is the same across reboots,
it can be easily included in the black list.
@@ -2877,7 +2877,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-12-01
+ Last Updated on 2008-12-06
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_uid
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_uid
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_uid
Sat Dec 6 09:40:12 2008
@@ -14,6 +14,8 @@
FS="\n"
RS=""
mm_uid=""
+ phys=""
+ bInterfaceNumber=""
}
mm_uid !~ /^$/ { next }
$1 !~ /^ *looking at / { next }
@@ -22,15 +24,46 @@
subsystem=""
while ( x < NF ) {
x++
+ if ( $x ~ /^ *SUBSYSTEMS?=="acpi"/ ) {
+ subsystem="acpi"
+ break
+ }
+ if ( $x ~ /^ *SUBSYSTEMS?=="input"/ ) {
+ subsystem="input"
+ break
+ }
if ( $x ~ /^ *SUBSYSTEMS?=="pci"/ ) {
subsystem="pci"
break
}
+ if ( $x ~ /^ *SUBSYSTEMS?=="serio"/ ) {
+ subsystem="serio"
+ break
+ }
if ( $x ~ /^ *SUBSYSTEMS?=="usb"/ ) {
subsystem="usb"
break
}
}
+ if ( subsystem == "acpi" ) {
+ while ( x < NF ) {
+ x++
+ }
+ if ( phys ) {
+ mm_uid="phys:" phys
+ }
+ }
+ if ( subsystem == "input" ) {
+ while ( x < NF ) {
+ x++
+ if ( $x ~ /^ *ATTRS?\{phys\}==/ ) {
+ phys=$x
+ sub(/^ *ATTRS?\{phys\}=="/, "", phys)
+ sub(/"$/, "", phys)
+ gsub(/\//, ":", phys)
+ }
+ }
+ }
if ( subsystem == "pci" ) {
class=""
class_prog=""
@@ -71,10 +104,19 @@
mm_uid="pci:" class ":" class_prog ":" vendor ":"
device ":" subsystem_vendor ":" subsystem_device ":" bus_id
}
}
+ if ( subsystem == "serio" ) {
+ while ( x < NF ) {
+ x++
+ }
+ if ( phys ) {
+ mm_uid="phys:" phys
+ }
+ }
if ( subsystem == "usb" ) {
idVendor=""
idProduct=""
serial=""
+ manufacturer=""
while ( x < NF ) {
x++
if ( $x ~ /^ *ATTRS?\{idVendor\}==/ ) {
@@ -98,9 +140,14 @@
sub(/^ *ATTRS?\{serial\}=="/, "", serial)
sub(/"$/, "", serial)
}
+ if ( $x ~ /^ *ATTRS?\{bInterfaceNumber\}==/ ) {
+ bInterfaceNumber=$x
+ sub(/^ *ATTRS?\{bInterfaceNumber\}=="/, "",
bInterfaceNumber)
+ sub(/"$/, "", bInterfaceNumber)
+ }
}
- if ( idVendor && idProduct && serial) {
- mm_uid="usb:" idVendor ":" idProduct ":" serial
+ if ( idVendor && idProduct ) {
+ mm_uid="usb:" idVendor ":" idProduct ":" serial ":"
bInterfaceNumber
}
}
if ( mm_uid ) {
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/02-minimyth-dev-persistent.rules
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/02-minimyth-dev-persistent.rules
Sat Dec 6 09:40:12 2008
@@ -0,0 +1,15 @@
+#-------------------------------------------------------------------------------
+#
+#-------------------------------------------------------------------------------
+ACTION!="add|change", GOTO="end"
+KERNEL=="event[0-9]*", SUBSYSTEM=="input", SUBSYSTEMS=="acpi|serio|usb",
GOTO="begin"
+KERNEL=="hiddev[0-9]*", SUBSYSTEM=="usb", SUBSYSTEMS=="usb",
GOTO="begin"
+KERNEL=="lcd[0-9]*", SUBSYSTEM=="lcd", SUBSYSTEMS=="usb",
GOTO="begin"
+KERNEL=="lirc[0-9]*", SUBSYSTEM=="lirc", SUBSYSTEMS=="usb",
GOTO="begin"
+KERNEL=="ttyUSB[0-9]*", SUBSYSTEM=="tty", SUBSYSTEMS=="usb",
GOTO="begin"
+GOTO="end"
+LABEL="begin"
+
+PROGRAM="mm_uid", RESULT=="?*", SYMLINK+="persistent/$result"
+
+LABEL="end"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-audio.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-audio.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-audio.rules.disabled
Sat Dec 6 09:40:12 2008
@@ -14,7 +14,8 @@
# <audio_card_number>: The audio card number. %n should work.
# <audio_card_device>: The audio device number for audio playback.
#-------------------------------------------------------------------------------
-ACTION=="add|remove", KERNEL=="card[0-9]*", SUBSYSTEM=="sound",
GOTO="begin"
+ACTION!="add|change|remove", GOTO="end"
+KERNEL=="card[0-9]*", SUBSYSTEM=="sound", GOTO="begin"
GOTO="end"
LABEL="begin"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-backend.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-backend.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-backend.rules.disabled
Sat Dec 6 09:40:12 2008
@@ -11,7 +11,8 @@
# where
# yes : Whether or not MythTV backend service should be enabled.
#-------------------------------------------------------------------------------
-ACTION=="add|remove", SUBSYSTEM=="dvb", GOTO="begin"
+ACTION!="add|change|remove", GOTO="end"
+SUBSYSTEM=="dvb", GOTO="begin"
GOTO="end"
LABEL="begin"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lcdproc.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lcdproc.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lcdproc.rules.disabled
Sat Dec 6 09:40:12 2008
@@ -16,7 +16,9 @@
# known, it cannot be added be included in mm_detect_state_lcdproc.
Therefore,
# the mm_detect script will prepend the LCDproc device name to the state.
#-------------------------------------------------------------------------------
-ACTION=="add|remove", KERNEL=="lcd[0-9]*|ttyUSB[0-9]*", SUBSYSTEM=="lcd|
tty|usb", SUBSYSTEMS=="usb", GOTO="begin"
+ACTION!="add|change|remove", GOTO="end"
+KERNEL=="lcd[0-9]*", SUBSYSTEM=="lcd", SUBSYSTEMS=="usb", GOTO="begin"
+KERNEL=="ttyUSB[0-9]*", SUBSYSTEM=="tty", SUBSYSTEMS=="usb", GOTO="begin"
GOTO="end"
LABEL="begin"
@@ -36,9 +38,6 @@
ENV{mm_detect_id}=="usb:15c2:0038",
ENV{mm_detect_state_lcdproc}="imonlcd"
ENV{mm_detect_id}=="usb:15c2:ffdc", ENV{mm_detect_state_lcdproc}="imon"
ENV{mm_detect_id}=="usb:1b3d:0153", ENV{mm_detect_state_lcdproc}="MtxOrb"
-
-# The state has been set, so give the device a persistent unique
identifier when possible.
-ENV{mm_detect_state_lcdproc}=="?*", PROGRAM="/lib/udev/mm_uid",
RESULT=="?*", SYMLINK+="minimyth/lcdproc/$result"
# The state has been set, so save it.
ENV{mm_detect_state_lcdproc}=="?*", RUN+="/lib/udev/mm_detect lcdproc %k
$env{mm_detect_state_lcdproc} state_prepend_devname"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-lirc.rules.disabled
Sat Dec 6 09:40:12 2008
@@ -23,7 +23,11 @@
# known, it cannot be added be included in mm_detect_state_lirc.
Therefore, the
# mm_detect script will prepend the LIRC device name to the state.
#-------------------------------------------------------------------------------
-ACTION=="add|remove", KERNEL=="lirc[0-9]*|event[0-9]*|hiddev[0-9]*|
ttyUSB[0-9]*", SUBSYSTEM=="lirc|input|usb|tty", SUBSYSTEMS=="usb",
GOTO="begin"
+ACTION!="add|change|remove", GOTO="end"
+KERNEL=="event[0-9]*", SUBSYSTEM=="input", SUBSYSTEMS=="usb", GOTO="begin"
+KERNEL=="hiddev[0-9]*", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", GOTO="begin"
+KERNEL=="lirc[0-9]*", SUBSYSTEM=="lirc", SUBSYSTEMS=="usb", GOTO="begin"
+KERNEL=="ttyUSB[0-9]*", SUBSYSTEM=="tty", SUBSYSTEMS=="usb", GOTO="begin"
GOTO="end"
LABEL="begin"
@@ -48,9 +52,6 @@
ENV{mm_detect_id}=="usb:147a:e02d",
ENV{mm_detect_state_lirc}="devinput,/etc/lirc.d/lircd.conf/optional/devinput.usb_147a_e02d"
LABEL="end-nonlirc"
-
-# The state has been set, so give the device a persistent unique
identifier when possible.
-ENV{mm_detect_state_lirc}=="?*", PROGRAM="/lib/udev/mm_uid", RESULT=="?*",
SYMLINK+="minimyth/lirc/$result"
# The state has been set, so save it.
ENV{mm_detect_state_lirc}=="?*", RUN+="/lib/udev/mm_detect lirc %k
$env{mm_detect_state_lirc} state_prepend_devname"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-x.rules.disabled
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-x.rules.disabled
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-detect-x.rules.disabled
Sat Dec 6 09:40:12 2008
@@ -14,7 +14,8 @@
# 'Device_' prefix) of the 'Device' section in the
# '/etc/xorg.conf' file.
#-------------------------------------------------------------------------------
-ACTION=="add|remove", SUBSYSTEM=="pci", ATTR{class}=="0x0300??",
GOTO="begin"
+ACTION!="add|change|remove", GOTO="end"
+SUBSYSTEM=="pci", ATTR{class}=="0x0300??", GOTO="begin"
GOTO="end"
LABEL="begin"
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
