[svn-commits] branch 1.2 r1060 - in /branches/1.2: ./ udev/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 16 08:43:41 2006
New Revision: 1060

URL: http://svn.digium.com/view/zaptel?rev=1060&view=rev
Log:
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:
    branches/1.2/Makefile
    branches/1.2/udev/zaptel.rules
    branches/1.2/udev/zaptel.rules-combined

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1060&r1=1059&r2=1060&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Tue May 16 08:43:41 2006
@@ -5,6 +5,7 @@
 #
 #
 BASEADDR=0xd0000
+PWD:=$(shell pwd)
 
 HOSTCC=gcc
 # If you want to build for a kernel other than the current kernel, set KVERS
@@ -167,7 +168,6 @@
 #PRIMARY=wcfxsusb
 PRIMARY=torisa
 #PRIMARY=wcfxo
-PWD:=$(shell pwd)
 
 all: $(BUILDVER) $(LIBTONEZONE_SO)
 
@@ -338,10 +338,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"
@@ -433,10 +433,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: branches/1.2/udev/zaptel.rules
URL: http://svn.digium.com/view/zaptel/branches/1.2/udev/zaptel.rules?rev=1060&r1=1059&r2=1060&view=diff
==============================================================================
--- branches/1.2/udev/zaptel.rules (original)
+++ branches/1.2/udev/zaptel.rules Tue May 16 08:43:41 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: branches/1.2/udev/zaptel.rules-combined
URL: http://svn.digium.com/view/zaptel/branches/1.2/udev/zaptel.rules-combined?rev=1060&r1=1059&r2=1060&view=diff
==============================================================================
--- branches/1.2/udev/zaptel.rules-combined (original)
+++ branches/1.2/udev/zaptel.rules-combined Tue May 16 08:43:41 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"