[pisa-src] r2577 - in trunk/openwrt: build-openwrt.sh configure_router.sh

From: Samuel Richter <samuel.richter@xxxxxxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Mon, 16 May 2011 20:47:07 +0200
Author: richter
Date: Mon May 16 20:47:07 2011
New Revision: 2577

Log:
openwrt image creation: move copying of dist tarballs from
configure_router.sh to build-openwrt.sh

Modified:
   trunk/openwrt/build-openwrt.sh
   trunk/openwrt/configure_router.sh

Modified: trunk/openwrt/build-openwrt.sh
==============================================================================
--- trunk/openwrt/build-openwrt.sh      Mon May 16 20:47:03 2011        (r2576)
+++ trunk/openwrt/build-openwrt.sh      Mon May 16 20:47:07 2011        (r2577)
@@ -11,7 +11,7 @@
 BASE_PATH="$HOME/src"
 OPENWRT="$BASE_PATH/openwrt"
 PISA="$BASE_PATH/pisa"
-HIPL="$BASE_PATH/hipl/trunk"
+HIPL="$BASE_PATH/hipl"
 
 if [ $DEBUG = "no" ]; then
     # Silence output to stdout
@@ -79,6 +79,11 @@
 fi
 
 echo_to_stderr "    Copying HIPL and PISA to OpenWRT"
+
+mkdir -p "${OPENWRT}/dl"
+rsync ${PISA}/pisa*.tar.gz ${OPENWRT}/dl
+rsync ${HIPL}/hipl*.tar.gz ${OPENWRT}/dl
+
 cd $PISA/openwrt || exit 1
 $PISA/openwrt/configure_router.sh pisa-testbed $OPENWRT $PISA $HIPL linksys
 echo_to_stderr "    Done."

Modified: trunk/openwrt/configure_router.sh
==============================================================================
--- trunk/openwrt/configure_router.sh   Mon May 16 20:47:03 2011        (r2576)
+++ trunk/openwrt/configure_router.sh   Mon May 16 20:47:07 2011        (r2577)
@@ -7,7 +7,7 @@
 usage() {
     echo $0 "<router_name> <path/to/openwrt/checkout> <path/to/pisa/checkout> 
<path/to/hipl/checkout> <asus|linksys>"
     echo "This program will configure an OpenWrt tree for flashing a PISA 
router."
-    echo "Your PISA and hipl trees are assumed to contain 'make dist' 
tarballs."
+    echo "The PISA and hipl tarballs are assumed to be copied to the openwrt 
'dl' folder."
     exit $1
 }
 
@@ -18,14 +18,6 @@
     fi
 }
 
-check_tarball () {
-    if test ! -r "$2"; then
-        echo $1 tarball not available.
-        echo Run 'make dist' in your $1 tree.
-        exit 1
-    fi
-}
-
 #This runs in a subshell to avoid changing directory unintentionally.
 sanitize_path () {
     (cd $1; pwd)
@@ -60,10 +52,6 @@
 check_directory PISA    ${PISA_PATH}
 check_directory hipl    ${HIPL_PATH}
 
-check_tarball PISA ${PISA_PATH}/pisa-*.tar.gz
-check_tarball hipl ${HIPL_PATH}/hipl-*.tar.gz
-
-
 ### configure OpenWrt tree ###
 PISA_VERSION=$(basename ${PISA_PATH}/pisa*.tar.gz | sed -e s/pisa-// -e 
s/.tar.gz//)
 OPENWRT_VERSION="SVN r$(svn info ${OPENWRT_PATH} | grep Revision: | cut -d' ' 
-f2)"
@@ -83,10 +71,6 @@
 sed -i -e "s/| PISA version: Subversion HEAD     |/| PISA version: 
$PISA_VERSION            |/" "${OPENWRT_PATH}/files/etc/banner"
 sed -i -e "s/| OpenWrt version: 8.09.1           |/| OpenWrt version: 
$OPENWRT_VERSION       |/" "${OPENWRT_PATH}/files/etc/banner"
 
-mkdir -p "${OPENWRT_PATH}/dl"
-rsync ${PISA_PATH}/pisa*.tar.gz ${OPENWRT_PATH}/dl
-rsync ${HIPL_PATH}/hipl*.tar.gz ${OPENWRT_PATH}/dl
-
 rsync -Lr --delete "${HIPL_PATH}/packaging/openwrt/hipl"     
"${OPENWRT_PATH}/package/"
 rsync -Lr --delete --exclude=.svn "${PISA_OPENWRT_PATH}/package/pisa"    
"${OPENWRT_PATH}/package/"
 
-- 
This is the pisa developer mailing list. Please also subscribe to the main pisa 
list at:
//www.freelists.org/list/pisa
[pisa-src] r2577 - in trunk/openwrt: build-openwrt.sh configure_router.sh

Other related posts:
