Hey all,
Well I have gotten wanpipe to build completly and to recompile zaptel and the kernel properly. The only issue currently is that the executables are in the $(STAGING_DIR) and not in the $(TARGET_DIR). I know they need to be stripped first then get placed in the proper locations. However I am not sure where all the etc files need to go. more importantly the init files as I know kris's rc script does things a little funny.
I patched wanpipe's Setup script so that it does not try to recompile zaptel as this was messing up the cross compile. I also made it take another argument that tells it where the wanpipe files are as Setup is not called from the current working directory, it got a little confused before.
I have yet to actually test if the files actually work properly as they are still sitting in the staging dir, and as I have yet to get a build to boot properly. I anyone can help me with these issues I would greatly appreciate it. Below is my wanpipe1.patch file and my wanpipe.mk file.
wanpipe1.patch:
diff -Naur wanpipe.orig/Setup wanpipe/Setup
--- wanpipe.orig/Setup 2006-04-14 12:24:06.000000000 -0400
+++ wanpipe/Setup 2006-04-17 15:02:41.000000000 -0400
@@ -448,6 +448,7 @@
# ----------------------------------------------------------------------------
prepare()
{
+ cd $ROOT
banner
# Verify filelist.
[ -f "$FILELIST" ] || {
@@ -5097,7 +5098,8 @@
if [ $zaptel_modified ] && [ $zaptel_modified -eq 1 ]; then
getyn "Your Zaptel source was modified, recompile/reinstall zaptel ?"
if [ $? -eq 0 ]; then
- tdmv_compile_zaptel
+ #tdmv_compile_zaptel
+ echo " Recompile/reinstall zaptel after Wanpipe installation"
else
echo " Recompile/reinstall zaptel after Wanpipe installation"
fi
@@ -5719,6 +5721,30 @@
echo "Zaptel path defined as: $ZAPTEL_INSTALL_DIR"
;;
+ --wanfiles*)
+ WANFILES=`echo $arg | cut -d'=' -f2`
+ if [ "$WANFILES" = "" ]; then
+ echo "Error: invalid --acflags option: [ string ]";
+ fi
+ PROD_HOME=$WANFILES
+ META_CONF=$PROD_HOME/$PROD.rc
+ WAN_INTR_DIR=$PROD_HOME/interfaces
+ WAN_CONF_DIR=$PROD_HOME
+ PROD_CONF=$WAN_CONF_DIR/wanpipe1.conf
+ PROD_PATCH=$PROD_HOME/patches
+ FILELIST=$PROD_HOME/Filelist
+ ROUTER_RC=$META_CONF
+ UTIL_DIR=$PROD_HOME/util
+ UTIL_BIN_DIR=$PROD_HOME/util/bin
+ WANROUTER_STARTUP_SMPL=$PROD_HOME/samples/wanrouter
+ DRIVER_TMP_DIR=$PROD_HOME/kdrvtmp
+ TEMP=$PROD_HOME/temp.$$
+ WANCFG=$PROD_HOME/util/wancfg_legacy/wancfg_legacy
+ CFGFT1=$PROD_HOME/util/ft1/wanpipe_cfgft1
+ DRIVER_UPDATE_DIR=$PROD_PATCH/kdrivers
+ DRIVER_TMP_DIR=$PROD_HOME/kdrvtmp
+ ;;
+
--builddir*)
ROOT=`echo $arg | cut -d'=' -f2`;
if [ "$ROOT" = "" ]; then
wanpipe.mk:
#############################################################
#
# wanpipe
#
#############################################################
WANPIPE_VER:=beta4-2.3.4
WANPIPE_SOURCE:=wanpipe-$(WANPIPE_VER).tgz
WANPIPE_SITE:=ftp://ftp.sangoma.com/linux/current_wanpipe/
WANPIPE_DIR:=$(BUILD_DIR)/wanpipe
WANPIPE_CAT:=zcat
WANPIPE_BINARY:=utils/wancfg/wancfg
WANPIPE_TARGET_DIR:=usr/sbin
WANPIPE_TARGET_BINARY:=$(WANPIPE_TARGET_DIR)/wancfg
$(DL_DIR)/$(WANPIPE_SOURCE):
$(WGET) -P $(DL_DIR) $(WANPIPE_SITE)/$(WANPIPE_SOURCE)
$(WANPIPE_DIR)/.unpacked: $(DL_DIR)/$(WANPIPE_SOURCE)
$(WANPIPE_CAT) $(DL_DIR)/$(WANPIPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(WANPIPE_DIR)/.unpacked
$(WANPIPE_DIR)/.configured: $(WANPIPE_DIR)/.unpacked
toolchain/patch-kernel.sh $(WANPIPE_DIR) package/wanpipe/ wanpipe\*.patch
touch $(WANPIPE_DIR)/.configured
$(WANPIPE_DIR)/.built: $(WANPIPE_DIR)/.configured
CWD=$(shell pwd)
cd $(WANPIPE_DIR)
PATH="$(ZAPTEL_DIR):$(PATH)" CC=$(TARGET_CC) $(WANPIPE_DIR)/Setup install --arch=$(ARCH) --protocol=TDM --with-linux=$(BUILD_DIR)/linux \
--zaptel-path=$(BUILD_DIR)/zaptel --builddir=$(STAGING_DIR) --linux-vanilla --edac --silent --no-gcc-debug --wanfiles=$(WANPIPE_DIR)
cd $(CWD)
touch $(WANPIPE_DIR)/.built
$(ZAPTEL_DIR)/.rebuilt: $(WANPIPE_DIR)/.built
# CWD=$(shell pwd)
# cd $(ZAPTEL_DIR)
$(MAKE1) -C $(ZAPTEL_DIR) clean
$(MAKE1) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits #hack
$(MAKE1) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/
touch $(ZAPTEL_DIR)/.rebuilt
$(LINUX_DIR)/.configuredagain: $(ZAPTEL_DIR)/.rebuilt
$(MAKE) -C $(LINUX_DIR) clean
cp $(LINUX_CONFIG_FILE) $(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) oldconfig
touch $(LINUX_DIR)/.configuredagain
$(LINUX_DIR)/.rebuiltkernel: $(LINUX_DIR)/.configuredagain $(LINUX_CONFIG_FILE)
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=i386 -C $(LINUX_DIR) bzImage
mkdir -p $(TARGET_DIR)/boot
ln -sf $(LINUX_DIR) $(BUILD_DIR)/linux
cp $(LINUX_DIR)/arch/i386/boot/bzImage $(TARGET_DIR)/boot/bzImage
touch $(LINUX_DIR)/.rebuiltkernel
$(LINUX_DIR)/.rebuiltmodules: $(LINUX_DIR)/.rebuiltkernel
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=i386 -C $(LINUX_DIR) modules
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) ARCH=i386 INSTALL_MOD_PATH=$(TARGET_DIR) -C $(LINUX_DIR) modules_install
rm $(TARGET_DIR)/lib/modules/$(LINUX_VER)/build $(TARGET_DIR)/lib/modules/$(LINUX_VER)/source
touch $(LINUX_DIR)/.rebuiltmodules
$(WANPIPE_DIR)/$(WANPIPE_BINARY): $(LINUX_DIR)/.rebuiltmodules
CWD=$(shell pwd)
cd $(WANPIPE_DIR)
PATH="$(ZAPTEL_DIR):$(PATH)" CC=$(TARGET_CC) $(WANPIPE_DIR)/Setup install --arch=$(ARCH) --protocol=TDM --with-linux=$(BUILD_DIR)/linux \
--zaptel-path=$(BUILD_DIR)/zaptel --builddir=$(STAGING_DIR) --linux-vanilla --edac --silent --no-gcc-debug --wanfiles=$(WANPIPE_DIR)
cd $(CWD)
$(ZAPTEL_DIR)/.finalbuild: $(WANPIPE_DIR)/.built
# CWD=$(shell pwd)
# cd $(ZAPTEL_DIR)
$(MAKE1) -C $(ZAPTEL_DIR) clean
$(MAKE1) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits #hack
$(MAKE1) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/
touch $(ZAPTEL_DIR)/.finalbuild
$(ZAPTEL_DIR)/.finalinstall: $(ZAPTEL_DIR)/.finalbuild
mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work...
mkdir -p $(STAGING_DIR)/share/man/man8 #yet another hack...
$(MAKE1) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool install
mkdir -p $(STAGING_DIR)/usr/include/linux
cp -a $(STAGING_DIR)/include/linux/zaptel.h $(STAGING_DIR)/usr/include/linux/zaptel.h #Hack for Asterisk to find us
cp -a $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc $(TARGET_DIR)/lib/modules/$(LINUX_VER)/
cp -a $(STAGING_DIR)/lib/libtone*so* $(TARGET_DIR)/lib/
cp -a $(STAGING_DIR)/$(ZAPTEL_TARGET_BINARY) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
cp -a $(STAGING_DIR)/sbin/zttool $(TARGET_DIR)/sbin/zttool
-$(STRIP) -g $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/*.ko
-$(STRIP) -g $(TARGET_DIR)/lib/libtone*
-$(STRIP) -g $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
-$(STRIP) -g $(TARGET_DIR)/sbin/zttool
/sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
$(INSTALL) -D -m 755 package/zaptel/zaptel.init $(TARGET_DIR)/etc/init.d/zaptel
ln -sf $(ZAPTEL_DIR) $(BUILD_DIR)/zaptel
ln -sf /tmp/etc/zaptel.conf $(TARGET_DIR)/etc/zaptel.conf
touch $(ZAPTEL_DIR)/.finalinstall
$(TARGET_DIR)/$(WANPIPE_TARGET_BINARY): $(WANPIPE_DIR)/$(WANPIPE_BINARY) $(ZAPTEL_DIR)/.finalinstall
touch $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY)
wanpipe: uclibc linux zaptel $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY)
wanpipe-clean:
rm -f $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY)
-$(MAKE) -C $(WANPIPE_DIR) clean
rm -Rf $(WANPIPE_DIR)
wanpipe-dirclean:
rm -rf $(WANPIPE_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_WANPIPE)),y)
TARGETS+=wanpipe
endif
Michael Cargile
_______________________________________________ Astlinux-users mailing list [email protected] http://lists.kriscompanies.com/mailman/listinfo/astlinux-users
Donations to support AstLinux are graciously accepted via PayPal to [EMAIL PROTECTED]
