[CUWiN-Dev] src-patch

[Bill Comisky]

Attached is a diff between the source I'm using for the nightly builds 
(crossbuilt from linux) and the repository trunk.  The changes, which are 
a combination of linux crossbuild tweaks and ISO build tweaks, are 
itemized below.

src/boot-image/steps.d/toolenv
- Use disklabel and fdisk from build tools.

src/boot-image/extras/extraslog
- Replace ./cuwboot directory, where boot.img for ISO is stored in
   image.subr.

src/boot-image/image.subr
- Modify $OFFICIAL if-block to be string comparison.
- Modify 'svn info' call to grep for Revision so I don't get "rev:?" in
   version string. 
- Increase floppy size to 2880 from 1440 for ISO build.


bill

--
Bill Comisky
bcomisky at pobox.com
-------------- next part --------------
Index: src/boot-image/steps.d/toolenv
===================================================================
--- src/boot-image/steps.d/toolenv	(revision 3403)
+++ src/boot-image/steps.d/toolenv	(working copy)
@@ -56,8 +56,4 @@
 EOF
 )
 
-# XXX override settings above
-export TOOL_DISKLABEL=/sbin/disklabel
-export TOOL_FDISK=/sbin/fdisk
-
 export INSTALL="$PLAIN_INSTALL -U -M $DESTDIR/metalog.new -D $DESTDIR"
Index: src/boot-image/extras/extraslog
===================================================================
--- src/boot-image/extras/extraslog	(revision 3403)
+++ src/boot-image/extras/extraslog	(working copy)
@@ -1,4 +1,5 @@
 . type=dir mode=755 uname=root gname=wheel
+./cuwboot type=dir uname=root gname=wheel mode=0755
 ./dev type=dir uname=root gname=wheel mode=0755
 ./dev/MAKEDEV.local type=file uname=root gname=wheel mode=0555
 ./etc type=dir mode=755 uname=root gname=wheel
Index: src/boot-image/image.subr
===================================================================
--- src/boot-image/image.subr	(revision 3403)
+++ src/boot-image/image.subr	(working copy)
@@ -15,7 +15,7 @@
 
 	# Get branding status of this build.  By default, builds are
 	# unofficial.
-	if [ $OFFICIAL ]; then
+	if [ "$OFFICIAL" = "1" ]; then
 		official_status="Official"
 	else
 		official_status="Unofficial"
@@ -32,7 +32,7 @@
 	cd $CUWSRC
 
 	# Retrieve SVN info for the current directory.
-	svn_info=$(svn info . 2>/dev/null)
+	svn_info=$(svn info . 2>/dev/null | grep Revision)
 	svn_info_rc=$?
 
 	# Format SVN info based on output of svn info command.
@@ -117,8 +117,10 @@
 	$FLOPPY_INSTALL -o root -g wheel -m 0400 \
 	    $DESTDIR/usr/mdec/boot $FLOPPYSTAGING
 
-	dd if=/dev/zero of=$tmpimage bs=1024 count=1440
-	$TOOL_MAKEFS -o optimization=space -f 0 -b 0 -s 1440k \
+	#FLOPPY_SIZE='1440'
+	FLOPPY_SIZE='2880'
+	dd if=/dev/zero of=$tmpimage bs=1024 count=$FLOPPY_SIZE
+	$TOOL_MAKEFS -o optimization=space -f 0 -b 0 -s ${FLOPPY_SIZE}k \
 	    $tmpimage $FLOPPYSTAGING || exit 1
 	rm -rf $FLOPPYSTAGING
 	$TOOL_DISKLABEL -F -f $DISKTAB -w $tmpimage floppy
@@ -130,7 +132,7 @@
 	$INSTALL -o root -g wheel $tmpimage $finalimage
 
 	# TBD write floppy here
-	# dd if=$tmpimage of=/dev/fd0a bs=1024 count=1440
+	# dd if=$tmpimage of=/dev/fd0a bs=1024 count=$FLOPPY_SIZE
 
 	rm -f $tmpimage
 }