From: John Hodge Date: Wed, 10 Jul 2013 16:52:16 +0000 (+0800) Subject: MakeReleaseSet - Fixing up script X-Git-Tag: rel0.15~366 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=62f9205dc3ba2c1f5b7b0f18db426c7ab9adc2c0;p=tpg%2Facess2.git MakeReleaseSet - Fixing up script --- diff --git a/MakeReleaseSet b/MakeReleaseSet index e3d75327..4553a00e 100755 --- a/MakeReleaseSet +++ b/MakeReleaseSet @@ -19,7 +19,8 @@ while [ $# -ge 2 ]; do shift done tar --transform="s|Dist/($ARCH/)*|Acess/|x" -zcf Releases/Acess2_latest_${ARCH}_bin.tar.gz Dist/$ARCH Dist/Acess2.$ARCH.gz -mdeltree b:/Acess2 2>&1 >/dev/null || true -mcopy -s Dist/$ARCH/ b:/Acess2 -mcopy Dist/Acess2* b:/Acess2/Acess2.gz +IMGNAME=AcessRelease.img +./Tools/BootFloppy/MakeDiskImage $IMGNAME +mcopy -i $IMGNAME -s Dist/$ARCH/ ::/Acess2 +mcopy -i $IMGNAME Dist/Acess2* ::/Acess2/Acess2.gz gzip -c AcessRelease.img > Releases/Acess2_latest_${ARCH}.img.gz diff --git a/Makefile.cfg b/Makefile.cfg index 3ec9975e..022a02ef 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -64,3 +64,10 @@ MODULES += Input/Keyboard Input/Mouse MODULES += IPStack # So the other modules are loaded before it #DYNMODS := USB/Core #DYNMODS += Filesystems/InitRD + +# BUILD_DIST=y - Install to ./Dist +ifneq ($(BUILD_DIST),) + DISTROOT := $(ACESSDIR)/Dist + xCP := cp + xMKDIR := mkdir -p +endif diff --git a/Tools/BootFloppy/MakeDiskImage b/Tools/BootFloppy/MakeDiskImage index 4412afb4..7a45556e 100755 --- a/Tools/BootFloppy/MakeDiskImage +++ b/Tools/BootFloppy/MakeDiskImage @@ -3,12 +3,13 @@ if [[ $# -ne 1 ]]; then echo "Usage: $0 " >&2 exit 1 fi +DIR=`dirname $0` IMGNAME=$1 dd if=/dev/zero of="$IMGNAME" bs=512 count=2880 mformat -i "$IMGNAME" ::/ -f 1440 -v Acess -dd if=stage1 bs=1 seek=0 count=3 "of=$IMGNAME" conv=notrunc -dd if=stage1 bs=1 skip=$((0x3E)) seek=$((0x3E)) "of=$IMGNAME" conv=notrunc +dd if=$DIR/stage1 bs=1 seek=0 count=3 "of=$IMGNAME" conv=notrunc +dd if=$DIR/stage1 bs=1 skip=$((0x3E)) seek=$((0x3E)) "of=$IMGNAME" conv=notrunc mmd -i "$IMGNAME" ::/boot -mcopy stage1 stage2 -i "$IMGNAME" ::/boot/ +mcopy $DIR/stage1 $DIR/stage2 -i "$IMGNAME" ::/boot/ /bin/echo -ne '\x23' | dd seek=$((0x44)) bs=1 count=1 "of=$IMGNAME" conv=notrunc -mcopy menu.lst -i "$IMGNAME" ::/boot/ +mcopy $DIR/menu.lst -i "$IMGNAME" ::/boot/ diff --git a/Tools/BootFloppy/menu.lst b/Tools/BootFloppy/menu.lst index 17ce6306..a956fa7d 100644 --- a/Tools/BootFloppy/menu.lst +++ b/Tools/BootFloppy/menu.lst @@ -1,5 +1,5 @@ timeout 1 -title Acess2 (x86,FDD) - kernel /Acess2/Acess2.x86.gz /System=fat:/Devices/fdd/0 /Acess=/System/Acess2/x86 +title Acess2 (FDD) + kernel /Acess2/Acess2.gz /System=fat:/Devices/fdd/0 /Acess=/System/Acess2/