[zaptel-commits] tzafrir: branch 1.4 r2874 - in /branches/1.4: ./ Makefile README
SVN commits to the Zaptel project
zaptel-commits at lists.digium.com
Fri Aug 17 07:50:36 CDT 2007
Author: tzafrir
Date: Fri Aug 17 07:50:36 2007
New Revision: 2874
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2874
Log:
* programs and install-programs are now for all of userspace.
Added the target 'utils' for what 'programs' used to be.
* tonezone.h is installed with install-libs, not install-include .
* Document this.
* Document some other variations on 'make' and 'make install'.
* Improve documentation of /proc/zaptel .
* Ignoring some more utilities.
Modified:
branches/1.4/ (props changed)
branches/1.4/Makefile
branches/1.4/README
Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: branches/1.4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug 17 07:50:36 2007
@@ -16,6 +16,16 @@
fxstest
zttest
fxotune
+patlooptest
+hdlcstress
+ztcfg-dude
+hdlctest
+timertest
+pattest
+hdlcgen
+usbfxstest
+patgen
+hdlcverify
*.ko
*.mod.c
.*.cmd
Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2874&r1=2873&r2=2874
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Fri Aug 17 07:50:36 2007
@@ -202,6 +202,7 @@
INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/zaptel
COPY_INITD := install -D zaptel.init $(INIT_TARGET)
endif
+RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default))
NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts ))
ifneq (,$(NET_SCR_DIR))
@@ -254,7 +255,7 @@
all: menuselect.makeopts
@$(MAKE) _all
-_all: $(if $(BUILD_MODULES),modules) programs libs
+_all: $(if $(BUILD_MODULES),modules) programs
libs: $(LTZ_SO) $(LTZ_A)
@@ -263,7 +264,9 @@
@$(MAKE) -C xpp/utils
endif
-programs: $(BINS) xpp-utils
+programs: libs utils
+
+utils: $(BINS) xpp-utils
modules: 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
@@ -433,7 +436,7 @@
$(UTILSO): %.o: %.c
$(CC) $(CFLAGS) -o $@ -c $<
-install: all devices install-modules install-libs firmware
+install: all devices install-modules install-programs firmware
@echo "###################################################"
@echo "###"
@echo "### Zaptel installed successfully."
@@ -443,7 +446,9 @@
@echo "###"
@echo "###################################################"
-install-programs: programs install-xpp
+install-programs: install-utils install-libs install-inlcude
+
+install-utils: utils install-xpp
install -d $(DESTDIR)$(BIN_DIR)
install $(BINS) $(DESTDIR)$(BIN_DIR)/
install -d $(DESTDIR)$(MAN_DIR)
@@ -480,6 +485,7 @@
ifeq (,$(DESTDIR))
if $(SELINUX_COND); then /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO); fi
endif
+ $(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
install-xpp:
ifeq (yes,$(BUILD_XPP))
@@ -488,7 +494,6 @@
install-include:
$(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
- $(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
devices:
ifndef DYNFS
@@ -553,14 +558,9 @@
ifneq (,$(COPY_INITD))
$(COPY_INITD)
endif
-ifneq (,$(wildcard /etc/default))
- ifeq (,$(wildcard $(DESTDIR)/etc/default/zaptel))
- install -D -m 644 zaptel.sysconfig $(DESTDIR)/etc/default/zaptel
- endif
-endif
-ifneq (,$(wildcard /etc/sysconfig))
- ifeq (,$(wildcard $(DESTDIR)/etc/sysconfig/zaptel))
- install -D -m 644 zaptel.sysconfig $(DESTDIR)/etc/sysconfig/zaptel
+ifneq (,$(RCCONF_DIR))
+ ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/zaptel))
+ $(INSTALL) -D -m 644 zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel
endif
endif
ifneq (,$(COPY_NETSCR))
Modified: branches/1.4/README
URL: http://svn.digium.com/view/zaptel/branches/1.4/README?view=diff&rev=2874&r1=2873&r2=2874
==============================================================================
--- branches/1.4/README (original)
+++ branches/1.4/README Fri Aug 17 07:50:36 2007
@@ -169,12 +169,17 @@
#make config
----------------------------------
-Selecting Modules
-^^^^^^^^^^^^^^^^^
-You can select the modules you wish to build by running
-`make menuselect` . The selection of modules that you build (or rather: not
-build) is saved in the file `menuselect.makeopts`.
-
+Build Tweaks
+~~~~~~~~~~~~
+Selecting Modules and Utilities
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+You can select the modules and utilities you wish to build and firmwares
+you wish to download by running `make menuselect` . The selection of modules
+that you build (or rather: not build) is saved in the file
+`menuselect.makeopts`.
+
+Extra Modules
+^^^^^^^^^^^^^
To build extra modules / modules directory not included in the Zaptel
distribution, use the optional variables MODULES_EXTRA and
SUBDIRS_EXTRA:
@@ -185,6 +190,48 @@
Note that those names are not guaranteed to continue to work on newer
versions. Hopefully there will be no need for such extra configuration.
+Partial Build/Install
+^^^^^^^^^^^^^^^^^^^^^
+There are some make targets that are provided to build or install just
+parts of Zaptel:
+
+. Build targets:
+ - make modules: build just the kernel modules.
+ - make programs: Build just the Zaptel userspace programs. partial
+ targets of it:
+ * make 'utilname': builds 'utilname' alone (e.g: `make ztdiag`)
+ * make utils: Build libtonezone.
+ * make libs: Build libtonezone.
+. Install targets:
+ - make install-modules: install just kernel modules.
+ - make firmware: download and install firmwares for Digium cards
+ - make install-programs: Userspace: Partial targets of it are:
+ * make install-utils: install Zaptel userspace programs and
+ and basic support files.
+ * make install-libs: install libtonezone
+ * make install-include: install zaptel.h
+ - make config: should be run once to configure
+
+Building to a Subtree
+^^^^^^^^^^^^^^^^^^^^^
+The following may be useful when testing the package or when preparing a
+package for a binary distribution (such as an rpm package) installing
+onto a subtree rather than on th real system.
+
+ make install DESTDIR=targetdir
+
+This can be useful for any partial install target of the above (e.g:
+install-modules or install-programs).
+
+the targetdir must be an absolute path, at least if you install the
+modules. To install to a relative path you can use something like:
+
+ 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=
zaptel.conf
~~~~~~~~~~~
@@ -316,11 +363,27 @@
The title line shows the number of the span, its name and title, and
(potentially) the alarms in which it is.
+The title shows the span number and name, followed by any allarms the
+span may have: For example, here is the first span in my system (with no
+alarms):
+
+ Span 1: XBUS-00/XPD-00 "Xorcom XPD #0/0: FXS"
+
The channel line for each channel shows its channel number, name and the
-actual signalling assigned to it through ztcfg.
+actual signalling assigned to it through ztcfg. Before being configured
+by ztcfg: This is Zaptel channel 2, whose name is 'XPP_FXS/0/0/1'.
+
+ 2 XPP_FXS/0/0/1
+
+After being configured by ztcfg: the signalling 'FXOLS' was added. FXS
+channels have FXO signalling and vice versa:
+
+ 2 XPP_FXS/0/0/1 FXOLS
If the channel is in use (typically opened by Asterisk) then you will
-see an extra '(In use)'.
+see an extra '(In use)':
+
+ 2 XPP_FXS/0/0/1 FXOLS (In use)
What is the license for the zaptel driver?
More information about the zaptel-commits
mailing list