[Pkg-voip-commits] r6078 - in /dahdi-linux/trunk/debian: dahdi-source.dirs dahdi-source.install patches/extra_modules patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Aug 25 18:50:16 2008
New Revision: 6078

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6078
Log:
Use the upstream install-modules target.

Added:
    dahdi-linux/trunk/debian/patches/extra_modules
Removed:
    dahdi-linux/trunk/debian/dahdi-source.install
Modified:
    dahdi-linux/trunk/debian/dahdi-source.dirs
    dahdi-linux/trunk/debian/patches/series
    dahdi-linux/trunk/debian/rules

Modified: dahdi-linux/trunk/debian/dahdi-source.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-source.dirs?rev=6078&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/dahdi-source.dirs (original)
+++ dahdi-linux/trunk/debian/dahdi-source.dirs Mon Aug 25 18:50:16 2008
@@ -1,2 +1,1 @@
 usr/src
-usr/include/dahdi

Added: dahdi-linux/trunk/debian/patches/extra_modules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/extra_modules?rev=6078&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/extra_modules (added)
+++ dahdi-linux/trunk/debian/patches/extra_modules Mon Aug 25 18:50:16 2008
@@ -1,0 +1,35 @@
+Support building extra modules from the variables MODULES_EXTRA and 
+SUBDIRS_EXTRA .
+
+Added to dahdi trunk, and should be in the release that follows RC2.
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,8 @@ else
+ UNAME_M:=$(DEB_HOST_GNU_TYPE)
+ endif
+ 
++DAHDI_MODULES_EXTRA:=$(MODULES_EXTRA:%=%.o) $(SUBDIRS_EXTRA:%=%/)
++
+ # If you want to build for a kernel other than the current kernel, set KVERS
+ ifndef KVERS
+ KVERS:=$(shell uname -r)
+@@ -55,7 +57,7 @@ endif
+ 
+ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
+ 
+-KMAKE=$(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
++KMAKE=$(MAKE) -C $(KSRC) ARCH=$(ARCH) 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
+--- a/drivers/dahdi/Kbuild
++++ b/drivers/dahdi/Kbuild
+@@ -28,6 +28,8 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECH
+ 
+ CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)
+ 
++obj-m += $(DAHDI_MODULES_EXTRA)
++
+ ifndef HOTPLUG_FIRMWARE
+ ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
+ HOTPLUG_FIRMWARE := yes

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=6078&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Aug 25 18:50:16 2008
@@ -4,3 +4,4 @@
 #zt_alarm_notify_no_master_change
 #zaphfc-florz
 #florz-vmalloc
+extra_modules

Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=6078&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Mon Aug 25 18:50:16 2008
@@ -113,6 +113,7 @@
 	dh_testroot
 	rm -f *-stamp
 	
+	$(MAKE) dist-clean
 	# Delete the generated bristuff symlinks:
 	$(RM) -f $(BRISTUFF_MODULES:%=%.[ch])
 	# Add here commands to clean up after the build process.
@@ -133,6 +134,7 @@
 	dh_clean -k
 	dh_installdirs
 	
+	$(MAKE) install-include DESTDIR=$(CURDIR)/debian/$(SKPG)
 	dh_install
 	# driver source code
 	mkdir -p $(TARDIR)/debian/generated