[Pkg-voip-commits] r7990 - in /dahdi-linux/trunk/debian: changelog patches/series patches/xpp_udev_rules_2632

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Jan 25 18:19:12 2010
New Revision: 7990

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7990
Log:
Patch xpp_udev_rules_2632: fix XPP udev rules (Closes: #562024). 

Added:
    dahdi-linux/trunk/debian/patches/xpp_udev_rules_2632
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=7990&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Jan 25 18:19:12 2010
@@ -12,8 +12,9 @@
   * Remove some remaining Zaptel left-overs.
   * Replaced extra drivers and patches with huge patch dahdi_linux_extra
     (Closes: #564720).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 21 Jan 2010 13:18:27 +0200
+  * Patch xpp_udev_rules_2632: fix XPP udev rules (Closes: #562024). 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 25 Jan 2010 19:04:05 +0200
 
 dahdi-linux (1:2.2.0.2~dfsg-1) unstable; urgency=low
 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=7990&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Jan 25 18:19:12 2010
@@ -3,3 +3,4 @@
 no_firmware_download
 mmx_auto
 uk_rotary
+xpp_udev_rules_2632

Added: dahdi-linux/trunk/debian/patches/xpp_udev_rules_2632
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/xpp_udev_rules_2632?rev=7990&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/xpp_udev_rules_2632 (added)
+++ dahdi-linux/trunk/debian/patches/xpp_udev_rules_2632 Mon Jan 25 18:19:12 2010
@@ -1,0 +1,55 @@
+Subject: Fix udev rules to work with more recent kernels.
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Date: Mon, 4 Jan 2010 17:01:34 +0000
+Origin: http://svn.digium.com/svn/dahdi/linux/trunk@7753
+Bug-Debian: http://bugs.debian.org/562024
+
+Patch currently applied in upstream trunk, and may be applied later in
+upstream branch 2.2, pending testing. For Debian it is safer, as the older
+udevs are not present (unless you use Etch or the likes).
+
+Note that this change will not work on most older systems (e.g.:
+Centos5, with its udev 0.95) if the matching change of xpp_fxloader in
+tools (r7752) is not applied.
+
+* Replace deprecated 'BUS' with 'SUBSYSTEM'
+* Sysfs{} should be replaced with ATTR{}. Sadly the former is not
+  supported in recent udev, and the latter is not supported in udev
+  0.95. Workaround: use PRODUCT from the environment.
+* Use a single rule.
+* While we're at it, add the missing comma to the astribank_hook line
+  (which surprisingly worked without it).
+
+
+---
+ drivers/dahdi/xpp/xpp.rules |   13 ++++---------
+ 1 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/dahdi/xpp/xpp.rules b/drivers/dahdi/xpp/xpp.rules
+index 300a437..93f772d 100644
+--- a/drivers/dahdi/xpp/xpp.rules
++++ b/drivers/dahdi/xpp/xpp.rules
+@@ -1,16 +1,11 @@
+-BUS!="usb", ACTION!="add", GOTO="xpp_usb_add_end"
+-KERNEL=="*_ep*", GOTO="xpp_usb_add_end"
+-KERNEL=="[0-9]*", GOTO="xpp_usb_add_end"
+-
+ # Load firmware into the Xorcom Astribank device:
+-SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="11[3456][013]", \
+-	RUN+="/usr/share/dahdi/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/$sysfs{bcdDevice}"
+-
+-LABEL="xpp_usb_add_end"
++SUBSYSTEM=="usb", ACTION=="add", \
++ENV{PRODUCT}=="e4e4/11[3456][013]/*", ENV{DEVTYPE}!="usb_interface", \
++	RUN+="/usr/share/dahdi/xpp_fxloader udev $env{PRODUCT}"
+ 
+ # Hotplug hook for Astribank up/down
+ # If you need this functionality, copy the astribank_hook.sample
+ # to $XPP_INIT_DIR/astribank_hook
+ #
+ # By default XPP_INIT_DIR="/usr/share/dahdi"
+-KERNEL=="xbus*" RUN+="%E{XPP_INIT_DIR}/astribank_hook udev $kernel $sysfs{status} $sysfs{connector}"
++KERNEL=="xbus*", RUN+="%E{XPP_INIT_DIR}/astribank_hook udev $kernel $sysfs{status} $sysfs{connector}"
+-- 
+1.6.5
+