[zaptel-commits] tzafrir: branch tzafrir/kernelmove r2162 - in /team/tzafrir/kernelmove: ./ ke...

zaptel-commits at lists.digium.com zaptel-commits at lists.digium.com
Mon Feb 12 19:06:12 MST 2007 

Author: tzafrir
Date: Mon Feb 12 20:06:11 2007
New Revision: 2162

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2162
Log:
Code basically sort-of buildable.
 * Some more moves to the kernel directory.
 * Basic 2.6 kbuild files in place.

Added:
    team/tzafrir/kernelmove/TODO   (with props)
    team/tzafrir/kernelmove/kernel/Kbuild   (with props)
    team/tzafrir/kernelmove/kernel/fasthdlc.h
      - copied unchanged from r2155, team/tzafrir/kernelmove/fasthdlc.h
    team/tzafrir/kernelmove/kernel/gendigits.c
      - copied unchanged from r2155, team/tzafrir/kernelmove/gendigits.c
    team/tzafrir/kernelmove/kernel/tormenta2.rbt
      - copied unchanged from r2155, team/tzafrir/kernelmove/tormenta2.rbt
Removed:
    team/tzafrir/kernelmove/fasthdlc.h
    team/tzafrir/kernelmove/gendigits.c
    team/tzafrir/kernelmove/tormenta2.rbt
Modified:
    team/tzafrir/kernelmove/Makefile
    team/tzafrir/kernelmove/configure
    team/tzafrir/kernelmove/configure.ac
    team/tzafrir/kernelmove/kernel/   (props changed)
    team/tzafrir/kernelmove/kernel/datamods/   (props changed)
    team/tzafrir/kernelmove/kernel/wct4xxp/   (props changed)
    team/tzafrir/kernelmove/kernel/wct4xxp/Kbuild
    team/tzafrir/kernelmove/kernel/ztcodec_dte/   (props changed)
    team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild

Modified: team/tzafrir/kernelmove/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/Makefile?view=diff&rev=2162&r1=2161&r2=2162
==============================================================================
--- team/tzafrir/kernelmove/Makefile (original)
+++ team/tzafrir/kernelmove/Makefile Mon Feb 12 20:06:11 2007
@@ -83,7 +83,7 @@
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
+KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
 
@@ -131,6 +131,8 @@
 LTZ_SO_MINOR_VER:=0
 
 MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
+#ZAP_SUBDIRS:=wct4xxp ztcodec_dte xpp datamods
+ZAP_SUBDIRS:=wct4xxp ztcodec_dte xpp 
 MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
 MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
@@ -147,6 +149,7 @@
 
 MOD_DESTDIR:=zaptel
 
+ifeq (0,1)
 obj-m:=$(MODULESO)
 ifeq ($(findstring wct4xxp,$(MENUSELECT_MODULES)),)
 obj-m+=wct4xxp/
@@ -161,6 +164,7 @@
 ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),)
 obj-m+=xpp/
 MODULES+=xpp
+endif
 endif
 
 # Set this to override hotplug firmware loading and revert to classic header
@@ -187,7 +191,7 @@
 
 linux26: prereq
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
+	$(KMAKE) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) modules
 
 xpp: linux26
 
@@ -240,24 +244,10 @@
 torisatool: torisatool.o
 	$(CC) -o $@ $^
 
-tones.h: gendigits
-	./gendigits > $@
-
-tor2fw.h: tormenta2.rbt makefw 
-	./makefw $< tor2fw > $@
-
-radfw.h: pciradio.rbt makefw
-	./makefw $< radfw > $@
-
-makefw: makefw.c
-	$(HOSTCC) -o $@ $^
-
-gendigits: LDLIBS+=-lm
-gendigits: CFLAGS=
-
 zaptel.c: tones.h 
 
-prereq: config.status tones.h tor2fw.h radfw.h version.h
+#prereq: config.status tones.h tor2fw.h radfw.h version.h
+prereq: config.status version.h
 
 zttool.o: zttool.c zaptel.h
 	$(CC) -g -c $(NEWT_INCLUDE) $(CFLAGS) -o $@ $<
@@ -492,7 +482,7 @@
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
 ifeq ($(BUILDVER),linux26)
-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
+	$(KMAKE) clean
 else
 	$(MAKE) -C wct4xxp clean
 	$(MAKE) -C ztcodec_dte clean

Added: team/tzafrir/kernelmove/TODO
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/TODO?view=auto&rev=2162
==============================================================================
--- team/tzafrir/kernelmove/TODO (added)
+++ team/tzafrir/kernelmove/TODO Mon Feb 12 20:06:11 2007
@@ -1,0 +1,13 @@
+Status of the branch:
+
+kernel 2.6 build basically getting close to work.
+
+TODO:
+* Fix building the Ocastic subdir in wct4xxp (probably minor issue).
+* Fix building the datamod dir(?)
+* kernel 2.4 .
+* "Kbuild" is not good for some older 2.6 kernels. (Makefile/makefile?)
+* How do we provide version.h to kernel dir?
+* Trim main Makefile.
+* dependencies? (ztd-eth->ztdynamic).
+* Configuration system.

Propchange: team/tzafrir/kernelmove/TODO
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/tzafrir/kernelmove/TODO
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/tzafrir/kernelmove/TODO
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: team/tzafrir/kernelmove/configure
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/configure?view=diff&rev=2162&r1=2161&r2=2162
==============================================================================
--- team/tzafrir/kernelmove/configure (original)
+++ team/tzafrir/kernelmove/configure Mon Feb 12 20:06:11 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1569 .
+# From configure.ac Revision: 2108 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -580,7 +580,7 @@
 PACKAGE_BUGREPORT=
 
 ac_unique_file="zaptel"
-ac_unique_file="zaptel.c"
+ac_unique_file="kernel/zaptel.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>

Modified: team/tzafrir/kernelmove/configure.ac
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/configure.ac?view=diff&rev=2162&r1=2161&r2=2162
==============================================================================
--- team/tzafrir/kernelmove/configure.ac (original)
+++ team/tzafrir/kernelmove/configure.ac Mon Feb 12 20:06:11 2007
@@ -9,7 +9,7 @@
 AC_INIT(zaptel, ZAP_VERSION, www.asterisk.org)
 
 # check existence of the package
-AC_CONFIG_SRCDIR([zaptel.c])
+AC_CONFIG_SRCDIR([kernel/zaptel.c])
 
 AC_COPYRIGHT("Zaptel")
 AC_REVISION($Revision$)

Propchange: team/tzafrir/kernelmove/kernel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 12 20:06:11 2007
@@ -1,0 +1,9 @@
+.*.swp
+.*.d
+*.cmd
+.tmp_versions
+gendigits
+makefw
+tones.h
+radfw.h
+tor2fw.h

Added: team/tzafrir/kernelmove/kernel/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/kernel/Kbuild?view=auto&rev=2162
==============================================================================
--- team/tzafrir/kernelmove/kernel/Kbuild (added)
+++ team/tzafrir/kernelmove/kernel/Kbuild Mon Feb 12 20:06:11 2007
@@ -1,0 +1,25 @@
+#-include $(src)/../opts
+
+# TODO: copy version.h automatically from source dir.
+
+EXTRA_CFLAGS = -DSTANDALONE_ZAPATA
+
+obj-m := $(MODULES:%=%.o) $(ZAP_SUBDIRS:%=%/)
+
+hostprogs-y := gendigits makefw
+
+HOSTLOADLIBES_gendigits += -lm
+
+$(obj)/zaptel.o: $(obj)/tones.h
+$(obj)/pciradio.o: $(obj)/radfw.h
+$(obj)/tor2.o: $(obj)/tor2fw.h
+
+$(obj)/tones.h: $(obj)/gendigits
+	$^ > $@
+
+$(obj)/tor2fw.h: $(src)/tormenta2.rbt makefw 
+	$(obj)/makefw $< tor2fw > $@
+
+$(obj)/radfw.h: $(src)/pciradio.rbt makefw
+	$(obj)/makefw $< radfw > $@
+

Propchange: team/tzafrir/kernelmove/kernel/Kbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/tzafrir/kernelmove/kernel/Kbuild
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/tzafrir/kernelmove/kernel/Kbuild
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: team/tzafrir/kernelmove/kernel/datamods/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 12 20:06:11 2007
@@ -1,0 +1,2 @@
+.*.d
+*.cmd

Propchange: team/tzafrir/kernelmove/kernel/wct4xxp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Feb 12 20:06:11 2007
@@ -1,3 +1,4 @@
 *.mod.c
 *.cmd
 *.ko
+.*.swp

Modified: team/tzafrir/kernelmove/kernel/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/kernel/wct4xxp/Kbuild?view=diff&rev=2162&r1=2161&r2=2162
==============================================================================
--- team/tzafrir/kernelmove/kernel/wct4xxp/Kbuild (original)
+++ team/tzafrir/kernelmove/kernel/wct4xxp/Kbuild Mon Feb 12 20:06:11 2007
@@ -1,6 +1,6 @@
 obj-m += wct4xxp.o
 
-EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
+EXTRA_CFLAGS := -DSTANDALONE_ZAPATA -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
 
 wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
 

Propchange: team/tzafrir/kernelmove/kernel/ztcodec_dte/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 12 20:06:11 2007
@@ -1,0 +1,1 @@
+.*.d

Modified: team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild?view=diff&rev=2162&r1=2161&r2=2162
==============================================================================
--- team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild (original)
+++ team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild Mon Feb 12 20:06:11 2007
@@ -1,6 +1,6 @@
 obj-m += ztcodec_dte.o
 
-EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+EXTRA_CFLAGS := -DSTANDALONE_ZAPATA -I$(src)/.. -Wno-undef
 
 ztcodec_dte-objs := base.o

More information about the zaptel-commits mailing list