[aadk-commits] qwell: branch upstreamsync r270 - /branches/upstreamsync/scripts/

Tue Mar 27 15:55:04 MST 2007

Author: qwell
Date: Tue Mar 27 17:55:03 2007
New Revision: 270

URL: http://svn.digium.com/view/aadk?view=rev&rev=270
Log:
Changes to match new build procedures/paths

Modified:
    branches/upstreamsync/scripts/build-asterisk
    branches/upstreamsync/scripts/build-bootloader
    branches/upstreamsync/scripts/build-common
    branches/upstreamsync/scripts/build-tftp
    branches/upstreamsync/scripts/build-toolchain

Modified: branches/upstreamsync/scripts/build-asterisk
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/build-asterisk?view=diff&rev=270&r1=269&r2=270
==============================================================================

--- branches/upstreamsync/scripts/build-asterisk (original)
+++ branches/upstreamsync/scripts/build-asterisk Tue Mar 27 17:55:03 2007
@@ -1,25 +1,26 @@
 #!/bin/sh -e
 cd ../
 . scripts/build-common
-cp -v uClinux/uClinux-dist/lib/ncurses/lib/libncurses.a $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/lib/
-cp -v uClinux/uClinux-dist/lib/ncurses/include/*.h $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/libtonezone/libtonezone.a $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/lib/
-cp -v uClinux/uClinux-dist/lib/zlib/libz.a $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/lib/
-cp -v uClinux/uClinux-dist/lib/zlib/zlib.h $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/zlib/zconf.h $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/libssl/libssl.so $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/lib/
-cp -v uClinux/uClinux-dist/lib/libssl/libcrypto.so $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/lib/
-mkdir -p $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/openssl/
-cp -v uClinux/uClinux-dist/lib/libssl/include/openssl/*.h $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/openssl/
-mkdir -p $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/zaptel/
-cp -v uClinux/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/zaptel/
-cp -v uClinux/uClinux-dist/linux-2.6.x/drivers/zaptel/tonezone.h $AADKDIR/toolchain/buildscript/out-uclinux/bfin-uclinux/runtime/usr/include/zaptel/
+cp -v uClinux/uClinux-dist/lib/ncurses/build/lib/libncurses.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
+cp -v uClinux/uClinux-dist/lib/ncurses/build/include/*.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
+cp -v uClinux/uClinux-dist/lib/ncurses/include/*.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
+cp -v uClinux/uClinux-dist/lib/libtonezone/libtonezone.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
+cp -v uClinux/uClinux-dist/lib/zlib/libz.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
+cp -v uClinux/uClinux-dist/lib/zlib/zlib.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
+cp -v uClinux/uClinux-dist/lib/zlib/zconf.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
+cp -v uClinux/uClinux-dist/lib/libssl/libssl.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
+cp -v uClinux/uClinux-dist/lib/libssl/libcrypto.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
+mkdir -p $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/openssl/
+cp -v uClinux/uClinux-dist/lib/libssl/include/openssl/*.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/openssl/
+mkdir -p $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
+cp -v uClinux/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
+cp -v uClinux/uClinux-dist/linux-2.6.x/drivers/zaptel/tonezone.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
 if [ "default" = "$1" ] ; then 
 	echo "Setting the Asterisk build to the default for the AADK."
 	cp -v scripts/menuselect.makeopts.AADK_default asterisk/menuselect.makeopts
 fi
 cd asterisk
-./configure --host=bfin-uclinux --disable-largefile CFLAGS="-g -mfdpic" --without-pwlib --without-curl #--with-zaptel=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-tonezone=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-ncurses=$AADKDIR/uClinux/uClinux-dist/lib/ncurses --with-openssl=$AADKDIR/uClinux/uClinux-dist/lib/libssl #--with-z=$AADKDIR/uClinux/uClinux-dist/lib/zlib
+./configure --host=bfin-linux-uclibc --disable-largefile CFLAGS="-g -mfdpic -L$AADK/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib" --without-pwlib --without-curl #--with-zaptel=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-tonezone=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-ncurses=$AADKDIR/uClinux/uClinux-dist/lib/ncurses --with-openssl=$AADKDIR/uClinux/uClinux-dist/lib/libssl #--with-z=$AADKDIR/uClinux/uClinux-dist/lib/zlib
 make menuselect
 mkdir -p ../uClinux/uClinux-dist/romfs/var/lib/asterisk/agi-bin
 mkdir -p ../uClinux/uClinux-dist/romfs/var/lib/asterisk/sounds

Modified: branches/upstreamsync/scripts/build-bootloader
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/build-bootloader?view=diff&rev=270&r1=269&r2=270
==============================================================================
--- branches/upstreamsync/scripts/build-bootloader (original)
+++ branches/upstreamsync/scripts/build-bootloader Tue Mar 27 17:55:03 2007
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/sh -e
 cd ../
 . scripts/build-common
 
 #Insert version information that can be displayed from the bootloader
-BOARDID_FILE="u-boot/u-boot_1.1.3/lib_blackfin/board_id.h"
+BOARDID_FILE="u-boot/u-boot_1.1.6/lib_blackfin/board_id.h"
 
 if [ -f ".version" -a -f ".flavor" ]; then 
 	echo "Version Files exist"
@@ -11,7 +11,7 @@
 	FLAVOR=`cat .flavor`
 	VERSIONID="#define VENDOR_ID \"$FLAVOR $VER\""
 else
-	VERSIONID="#define \"DIGIUM Unknown\""
+	VERSIONID="#define VENDOR_ID \"DIGIUM Unknown\""
 fi 
 echo "/*Autogenerated header file*/"	>${BOARDID_FILE}
 echo "#ifndef __BOARD_ID_H__"	>>${BOARDID_FILE}
@@ -20,7 +20,7 @@
 echo "#endif"					>>${BOARDID_FILE}
 
 # actually build the bootloader
-cd u-boot/u-boot_1.1.3
+cd u-boot/u-boot_1.1.6
 make distclean
 make s800i_config
 make

Modified: branches/upstreamsync/scripts/build-common
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/build-common?view=diff&rev=270&r1=269&r2=270
==============================================================================
--- branches/upstreamsync/scripts/build-common (original)
+++ branches/upstreamsync/scripts/build-common Tue Mar 27 17:55:03 2007
@@ -1,3 +1,4 @@
 #!/bin/sh
 AADKDIR=`pwd`
 export PATH=$AADKDIR/toolchain/buildscript/out-uclinux/bin:$PATH
+export PATH=$AADKDIR/toolchain/buildscript/out-linux-uclibc/bin:$PATH

Modified: branches/upstreamsync/scripts/build-tftp
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/build-tftp?view=diff&rev=270&r1=269&r2=270
==============================================================================
--- branches/upstreamsync/scripts/build-tftp (original)
+++ branches/upstreamsync/scripts/build-tftp Tue Mar 27 17:55:03 2007
@@ -2,6 +2,6 @@
 . scripts/build-common
 cd uClinux/uClinux-dist
 cp -v images/uImage /tftpboot
-cd ../../u-boot/u-boot_1.1.3
+cd ../../u-boot/u-boot_1.1.6
 cd tools/bin2ldr
 cp -v app.ldr app.bin app.hex /tftpboot

Modified: branches/upstreamsync/scripts/build-toolchain
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/build-toolchain?view=diff&rev=270&r1=269&r2=270
==============================================================================
--- branches/upstreamsync/scripts/build-toolchain (original)
+++ branches/upstreamsync/scripts/build-toolchain Tue Mar 27 17:55:03 2007
@@ -3,4 +3,4 @@
 . scripts/build-common
 echo "Preparing to build toolchain (This may take an hour or more)"
 cd toolchain/buildscript
-./BuildToolChain -s $AADKDIR/toolchain -k $AADKDIR/uClinux/uClinux-dist -B 2.17 -c 3.4
+./BuildToolChain -s $AADKDIR/toolchain -k $AADKDIR/uClinux/uClinux-dist/linux-2.6.x -B 2.17 -c 3.4

