[zaptel-commits] tzafrir: branch tzafrir/move r3759 - in /team/tzafrir/move: ./ Makefile kernel/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Mon Jan 28 17:41:11 2008
New Revision: 3759

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3759
Log:
* Move octasic external to the kernel as well.
* Fix the explicit install-time dependencies of modules to the kernel.
* And kernel 2.6 build/install now works.

Modified:
    team/tzafrir/move/   (props changed)
    team/tzafrir/move/Makefile
    team/tzafrir/move/kernel/   (props changed)

Propchange: team/tzafrir/move/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Mon Jan 28 17:41:11 2008
@@ -1,2 +1,1 @@
 menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
-oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR49-00/software

Modified: team/tzafrir/move/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/Makefile?view=diff&rev=3759&r1=3758&r2=3759
==============================================================================
--- team/tzafrir/move/Makefile (original)
+++ team/tzafrir/move/Makefile Mon Jan 28 17:41:11 2008
@@ -122,6 +122,8 @@
 
 MOD_DESTDIR:=zaptel
 
+KERN_DIR:=kernel
+
 #NOTE NOTE NOTE
 #
 # all variables set before the include of Makefile.kernel26 are needed by the 2.6 kernel module build process
@@ -137,15 +139,15 @@
 KBUILD_OBJ_M=$(BUILD_TOPDIR_MODULES:%=%.o) $(BUILD_SUBDIR_MODULES:%=%/)
 
 ifeq ($(BUILDVER),linux24)
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.o)
+  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
   INSTALL_MODULES+=$(foreach mod,$(BUILD_SUBDIR_MODULES),$(mod)/$(mod).o)
-  ALL_MODULES:=$(TOPDIR_MODULES:%=%.o)
-  ALL_MODULES+=$(SUBDIR_MODULES:%=%/%.o)
-else
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.ko)
-  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(mod)/$(mod).ko)
+  ALL_MODULES:=$(TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
+  ALL_MODULES+=$(SUBDIR_MODULES:%=$(KERN_DIR)/%/%.o)
+else
+  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.ko)
+  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(KERN_DIR)/$(mod)/$(mod).ko)
   ifneq ($(filter xpp,$(BUILD_SUBDIR_MODULES)),)
-  INSTALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
+  INSTALL_MODULES+=$(patsubst %,$(KERN_DIR)/xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
   endif
 
   ALL_MODULES:=$(TOPDIR_MODULES:%=%.ko)

Propchange: team/tzafrir/move/kernel/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Mon Jan 28 17:41:11 2008
@@ -1,0 +1,1 @@
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR49-00/software

Propchange: team/tzafrir/move/kernel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 28 17:41:11 2008
@@ -1,0 +1,9 @@
+*.cmd
+*.mod.c
+*.o
+*.ko
+.tmp_versions
+radfw.h
+tor2fw.h
+makefw
+Module.symvers