[zaptel-commits] trunk r1061 - in /trunk: ./ udev/

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 16 08:45:14 2006
New Revision: 1061

URL: http://svn.digium.com/view/zaptel?rev=1061&view=rev
Log:
Merged revisions 1060 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1060 | kpfleming | 2006-05-16 08:43:41 -0500 (Tue, 16 May 2006) | 4 lines

ensure that PWD is set early enough for 'make install' to actually work
use proper KERNEL matching syntax for udev rules
don't install udev rules as mode 0444; there is no need to make them read-only

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/udev/zaptel.rules
    trunk/udev/zaptel.rules-combined

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue May 16 08:45:14 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1061&r1=1060&r2=1061&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue May 16 08:45:14 2006
@@ -7,6 +7,7 @@
 .EXPORT_ALL_VARIABLES:
 
 BASEADDR=0xd0000
+PWD:=$(shell pwd)
 
 HOSTCC=gcc
 ifeq ($(DEB_HOST_GNU_TYPE),)
@@ -197,7 +198,6 @@
 #PRIMARY=wcfxsusb
 PRIMARY=torisa
 #PRIMARY=wcfxo
-PWD:=$(shell pwd)
 
 all: modules $(LIBTONEZONE_SO)
 
@@ -354,10 +354,10 @@
 else # DYNFS
   ifdef UDEVRULES
     ifdef UDEVPERMISSIONS
-	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
-	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
+	install -m 666 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
+	install -m 666 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
     else # !UDEVPERMISSIONS (newer, combined syntax)
-	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
+	install -m 666 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
     endif
   else # !UDEVRULES
 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
@@ -454,10 +454,10 @@
 install-udev:
   ifdef UDEVRULES
     ifdef UDEVPERMISSIONS
-	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
-	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
+	install -m 666 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
+	install -m 666 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
     else # !UDEVPERMISSIONS (newer, combined syntax)
-	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
+	install -m 666 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
     endif
   endif
 

Modified: trunk/udev/zaptel.rules
URL: http://svn.digium.com/view/zaptel/trunk/udev/zaptel.rules?rev=1061&r1=1060&r2=1061&view=diff
==============================================================================
--- trunk/udev/zaptel.rules (original)
+++ trunk/udev/zaptel.rules Tue May 16 08:45:14 2006
@@ -1,6 +1,6 @@
 # zaptel devices
-KERNEL="zapctl",     NAME="zap/ctl"
-KERNEL="zaptimer",   NAME="zap/timer"
-KERNEL="zapchannel", NAME="zap/channel"
-KERNEL="zappseudo",  NAME="zap/pseudo"
-KERNEL="zap[0-9]*",  NAME="zap/%n"
+KERNEL=="zapctl",     NAME="zap/ctl"
+KERNEL=="zaptimer",   NAME="zap/timer"
+KERNEL=="zapchannel", NAME="zap/channel"
+KERNEL=="zappseudo",  NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",  NAME="zap/%n"

Modified: trunk/udev/zaptel.rules-combined
URL: http://svn.digium.com/view/zaptel/trunk/udev/zaptel.rules-combined?rev=1061&r1=1060&r2=1061&view=diff
==============================================================================
--- trunk/udev/zaptel.rules-combined (original)
+++ trunk/udev/zaptel.rules-combined Tue May 16 08:45:14 2006
@@ -1,6 +1,6 @@
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL=="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"