[Astlinux-commits] SF.net SVN: astlinux:[5478] branches/1.0/scripts/astlinux-makeimage

[<abe...@us...>]

Revision: 5478
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5478&view=rev
Author:   abelbeck
Date:     2012-03-09 18:37:45 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
astlinux-makeimage, first use bximage on host, else use the SVN binary

Modified Paths:
--------------
    branches/1.0/scripts/astlinux-makeimage

Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage	2012-03-03 02:08:39 UTC (rev 5477)
+++ branches/1.0/scripts/astlinux-makeimage	2012-03-09 18:37:45 UTC (rev 5478)
@@ -74,6 +74,12 @@
   exit 1
 fi
 
+BXIMAGE="bximage"
+if ! which $BXIMAGE >/dev/null 2>&1; then
+  echo "Using local 32-bit bximage binary."
+  BXIMAGE="./scripts/bximage"
+fi
+
 DISK_SIZE=$1
 DOS_SIZE=$2
 AST_SIZE=$3
@@ -120,7 +126,7 @@
 
 # dd if=/dev/zero of=runnix.img bs=1024 count=$(($DISK_SIZE*1024))
 
-./scripts/bximage -q -hd -mode=flat -size=$DISK_SIZE runnix.img > bximage.out
+$BXIMAGE -q -hd -mode=flat -size=$DISK_SIZE runnix.img > bximage.out
 
 sudo losetup ${LOOPD}0 runnix.img
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.