[svn-commits] tzafrir: linux/trunk r8034 - in /linux/trunk: Makefile README

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Feb 15 03:17:54 2010
New Revision: 8034

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8034
Log:
Don't generate static device files at install time.

* Most users use udev anyway
* Don't attempt to create any device files in the 'install' target.
* Setting DYNFS at build time should no longer be needed
  - Though remains harmless.
* In order to create the static device files, use the script:

  build_tools/make_static_devs


Modified:
    linux/trunk/Makefile
    linux/trunk/README

Modified: linux/trunk/Makefile
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/Makefile?view=diff&rev=8034&r1=8033&r2=8034
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Mon Feb 15 03:17:54 2010
@@ -55,10 +55,6 @@
 
 KMAKE=$(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 
-ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d))
-  DYNFS:=yes
-endif
-
 ROOT_PREFIX:=
 
 ASCIIDOC:=asciidoc
@@ -139,40 +135,12 @@
 	-rmdir $(DESTDIR)/usr/include/dahdi
 
 install-devices:
-ifndef DYNFS
-	mkdir -p $(DESTDIR)/dev/dahdi
-	rm -f $(DESTDIR)/dev/dahdi/ctl
-	rm -f $(DESTDIR)/dev/dahdi/channel
-	rm -f $(DESTDIR)/dev/dahdi/pseudo
-	rm -f $(DESTDIR)/dev/dahdi/timer
-	rm -f $(DESTDIR)/dev/dahdi/transcode
-	rm -f $(DESTDIR)/dev/dahdi/253
-	rm -f $(DESTDIR)/dev/dahdi/252
-	rm -f $(DESTDIR)/dev/dahdi/251
-	rm -f $(DESTDIR)/dev/dahdi/250
-	mknod $(DESTDIR)/dev/dahdi/ctl c 196 0
-	mknod $(DESTDIR)/dev/dahdi/transcode c 196 250
-	mknod $(DESTDIR)/dev/dahdi/timer c 196 253
-	mknod $(DESTDIR)/dev/dahdi/channel c 196 254
-	mknod $(DESTDIR)/dev/dahdi/pseudo c 196 255
-	N=1; \
-	while [ $$N -lt 250 ]; do \
-		rm -f $(DESTDIR)/dev/dahdi/$$N; \
-		mknod $(DESTDIR)/dev/dahdi/$$N c 196 $$N; \
-		N=$$[$$N+1]; \
-	done
-else # DYNFS
 	install -d $(DESTDIR)/etc/udev/rules.d
 	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/dahdi.rules
 	install -m 644 drivers/dahdi/xpp/xpp.rules $(DESTDIR)/etc/udev/rules.d/
-endif
 
 uninstall-devices:
-ifndef DYNFS
-	-rm -rf $(DESTDIR)/dev/dahdi
-else # DYNFS
 	rm -f $(DESTDIR)/etc/udev/rules.d/dahdi.rules
-endif
 
 install-modules: modules
 ifndef DESTDIR

Modified: linux/trunk/README
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/README?view=diff&rev=8034&r1=8033&r2=8034
==============================================================================
--- linux/trunk/README (original)
+++ linux/trunk/README Mon Feb 15 03:17:54 2010
@@ -93,11 +93,6 @@
 
   make install-modules DESTDIR=$PWD/target
 
-The 'install' target might fail if run as a user to a DESTDIR when
-attempting to generate device files. In that case, try:
-
-  make install DESTDIR=$PWD/target DYNFS=
-
 
 Extra Modules
 ~~~~~~~~~~~~~
@@ -107,6 +102,22 @@
 
   make MODULES_EXTRA="mod1 mod2"
   make MODULES_EXTRA="mod1 mod2" SUBDIRS_EXTRA="subdir1/ subdir1/"
+
+
+Static Device Files
+~~~~~~~~~~~~~~~~~~~
+Userspace programs communicate with the DAHDI modules through special
+device files under /dev/dahdi .  Those are normally created by udev, but
+if you use an embedded-type system and don't wish to use udev, you can
+generate them with the following script, from the source directory:
+
+  ./build_tools/make_static_devs
+
+This will generate the device files under /dev/dahdi . If you need to
+generate them elsewhere (e.g. `tmp/newroot/dev/dahdi`) use the option -d
+to the script:
+
+  ./build_tools/make_static_devs -d tmp/newroot/dev/dahdi
 
 
 Installing the B410P drivers with mISDN