Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2011-12-24 20:03:44
|
Revision: 5343
http://astlinux.svn.sourceforge.net/astlinux/?rev=5343&view=rev
Author: abelbeck
Date: 2011-12-24 20:03:38 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
astlinux-makeimage, fix issue when CYL was not a multiple of 4
Modified Paths:
--------------
branches/1.0/scripts/astlinux-makeimage
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2011-12-24 13:33:25 UTC (rev 5342)
+++ branches/1.0/scripts/astlinux-makeimage 2011-12-24 20:03:38 UTC (rev 5343)
@@ -114,7 +114,8 @@
rm -f bximage.out
# bximage insists on H=16... but most CF is H=64/S=63
-if [ $HEADS -eq 16 ]; then
+# Make sure CYL is a multiple of 4
+if [ $HEADS -eq 16 ] && [ $(($CYL % 4)) -eq 0 ]; then
CYL=$(($CYL / 4))
HEADS=$(($HEADS * 4))
fi
@@ -125,6 +126,8 @@
exit 1
fi
+echo "Disk Geometry: CYL=$CYL HEADS=$HEADS SECTORS=$SECTORS"
+
( if [ $AST_SIZE -gt 0 ]; then
echo -e "n\np\n1\n\n+${DOS_SIZE}M\nt\n6\na\n1"
echo -e "n\np\n2\n\n+${AST_SIZE}M\nt\n2\n83"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-03-01 20:07:01
|
Revision: 5474
http://astlinux.svn.sourceforge.net/astlinux/?rev=5474&view=rev
Author: abelbeck
Date: 2012-03-01 20:06:55 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
astlinux-makeimage, add REQUIRED_CMDS check
Modified Paths:
--------------
branches/1.0/scripts/astlinux-makeimage
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2012-03-01 14:58:13 UTC (rev 5473)
+++ branches/1.0/scripts/astlinux-makeimage 2012-03-01 20:06:55 UTC (rev 5474)
@@ -2,11 +2,13 @@
#
# astlinux-makeimage [imagesize in MB] [dos partition size in MB] [ASTURW partition size in MB]
#
-# astlinux-makeimage -z 128 128 0
+# astlinux-makeimage -z 256 256 0
#
PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
+REQUIRED_CMDS="which sudo mkdosfs mkfs fdisk losetup gzip"
+
RUNNIX_VER="$(awk -F'=' '/^RUNNIX_VER/ { print $2; exit }' boot/runnix/runnix.mk)"
RUNNIX_DIR="output/build/runnix-${RUNNIX_VER// /}"
@@ -57,6 +59,21 @@
exit 1
fi
+error=0
+for i in $REQUIRED_CMDS; do
+ if ! which $i >/dev/null 2>&1; then
+ error=1
+ echo "astlinux-makeimage: Required command \"$i\" is missing in your build environment." >&2
+ if [ "$i" = "which" ]; then # no use proceeding
+ break
+ fi
+ fi
+done
+if [ $error -ne 0 ]; then
+ echo "Missing Required Command(s)." >&2
+ exit 1
+fi
+
DISK_SIZE=$1
DOS_SIZE=$2
AST_SIZE=$3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-03-09 18:37:51
|
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.
|
|
From: <abe...@us...> - 2012-03-12 00:25:35
|
Revision: 5479
http://astlinux.svn.sourceforge.net/astlinux/?rev=5479&view=rev
Author: abelbeck
Date: 2012-03-12 00:25:29 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
astlinux-makeimage, revert r5478, the proper 32-bit libraries installed on the host allow both bximage and ./syslinux to work.
Revision Links:
--------------
http://astlinux.svn.sourceforge.net/astlinux/?rev=5478&view=rev
Modified Paths:
--------------
branches/1.0/scripts/astlinux-makeimage
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2012-03-09 18:37:45 UTC (rev 5478)
+++ branches/1.0/scripts/astlinux-makeimage 2012-03-12 00:25:29 UTC (rev 5479)
@@ -74,12 +74,6 @@
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
@@ -126,7 +120,7 @@
# dd if=/dev/zero of=runnix.img bs=1024 count=$(($DISK_SIZE*1024))
-$BXIMAGE -q -hd -mode=flat -size=$DISK_SIZE runnix.img > bximage.out
+./scripts/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.
|
|
From: <abe...@us...> - 2015-12-16 13:06:07
|
Revision: 7410
http://sourceforge.net/p/astlinux/code/7410
Author: abelbeck
Date: 2015-12-16 13:06:04 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
astlinux-makeimage, fix for bash 4.3, fortunately backward compatible
Modified Paths:
--------------
branches/1.0/scripts/astlinux-makeimage
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2015-12-16 03:58:25 UTC (rev 7409)
+++ branches/1.0/scripts/astlinux-makeimage 2015-12-16 13:06:04 UTC (rev 7410)
@@ -169,7 +169,7 @@
temp="${LOOPD}0"
PREFIXLEN=${#temp}
-PREFIX="^${temp//\//\/}"
+PREFIX="^${temp//\//\\/}"
# need to filter out bootable marker ('*') so it doesn't show up as $2
eval $(sudo $HOST_BIN/fdisk -c=dos -u=sectors -l ${LOOPD}0 | tr '*' ' ' | awk "/${PREFIX}/ { printf \"%s=%s\\n\", substr(\$1, $PREFIXLEN+1), \$2; }")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-05-04 15:40:11
|
Revision: 7666
http://sourceforge.net/p/astlinux/code/7666
Author: abelbeck
Date: 2016-05-04 15:40:08 +0000 (Wed, 04 May 2016)
Log Message:
-----------
astlinux-makeimage, some systems take a second or two before /mnt/runnix is not busy
Modified Paths:
--------------
branches/1.0/scripts/astlinux-makeimage
Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage 2016-05-03 17:39:27 UTC (rev 7665)
+++ branches/1.0/scripts/astlinux-makeimage 2016-05-04 15:40:08 UTC (rev 7666)
@@ -238,7 +238,17 @@
editConf
)
-sudo umount /mnt/runnix
+# Some systems take a second or two before /mnt/runnix is not busy
+cnt=5
+while [ $cnt -gt 0 ]; do
+ cnt=$((cnt - 1))
+ sleep 2
+ if sudo umount /mnt/runnix; then
+ echo "/mnt/runnix is un-mounted"
+ break
+ fi
+done
+
sudo rmdir /mnt/runnix
sudo losetup -d ${LOOPD}1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X