Updates for sarge r1

update-cd

@@ -14,37 +14,38 @@ set -e
 # Configuration goes here.
 
 # Where is your mirror?
-MIRROR=${MIRROR:-/mirror/debian}
+MIRROR_NORM=/mirror/debian
+MIRROR_AMD64=/mirror/debian-amd64
 
 # If you have a non-US mirror, where is it? Leave blank if you don't have one.
-NONUS=${NONUS:-/mirror/debian-non-US}
+# NONUS=${NONUS:-/mirror/debian-non-US}
 
 # Do you want non-free? 1 for yes, 0 for no
-#NONFREE=1
+NONFREE=1
 
 # What release version is this?
-VER=3.0r3
+VER=3.1r1
 
 # Path to use with mkisofs/mkhybrid
-MKISOFS=${MKISOFS:-"mkhybrid"}
-MKISOFS=mkisofs-jte
+#MKISOFS=${MKISOFS:-"mkhybrid"}
+MKISOFS=mkisofs
 
 # Use JTE extensions to mkisofs to make jigdo files?
 JTE=1
 
 # The working directory to use. MUST be on the same partition as the mirror.
-TDIR=/mirror/debian-cd
+TDIR=/mirror/sarge-update
 
 # Building woody cd set ...
-CODENAME=woody
+CODENAME=sarge
 
 # Path where the images will be written
-OUT=/mirror/woody-update/r3
+OUT=/mirror/sarge-update/r1
 
 # Location of the diff file to use to determine the changes. If you leave
 # this blank, we'll try to determine the changes from the ChangeLog files,
 # which is probably less accurate. 
-DIFF=/mirror/lists/$CODENAME/r0-r3.diff #~/r3.diff
+DIFF=/mirror/lists/$CODENAME/r0-r1.diff #~/r3.diff
 
 CDSIZE=620 # megabytes, leaving space for metadata
 REL=Debian"$VER"
@@ -58,7 +59,7 @@ VERBOSE=2
 GRAB_MD5=$BASEDIR/tools/grab_md5
 export VERBOSE BASEDIR SECTS
 
-ARCHLIST="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc src" # all dealt with specially
+ARCHLIST="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source" # amd64 # all dealt with specially
 
 export TDIR NONFREE NONUS VER MIRROR CODENAME OUT BASEDIR
 
@@ -77,8 +78,8 @@ create_control_files () {
     for ARCH in $ARCHES
     do
         case "$ARCH" in
-            src)
-                echo "    src"
+            source)
+                echo "    source"
                 for SECT in $SECTS
                 do
                     mkdir -p $CDDIR/dists/$CODENAME/$SECT/source
@@ -161,10 +162,9 @@ make_cd () {
 
 echo Cleaning up
 rm -rf $UPD
-mkdir $UPD
+mkdir -p $UPD
 CDNUM=1
 
-cd $MIRROR
 echo Creating file list
 
 if [ ! -e $DIFF ] ; then
@@ -188,6 +188,12 @@ for THISARCH in $ARCHLIST
 do
 	THISNUM=0
 
+	if [ $THISARCH = amd64 ] ; then
+		MIRROR=$MIRROR_AMD64
+	else
+		MIRROR=$MIRROR_NORM
+	fi
+
 	rm -f $UPD/md5-check
 	$GRAB_MD5 $MIRROR $THISARCH $CODENAME $UPD/md5-check
 	if [ "$NONUS"x != ""x ] ; then
@@ -200,7 +206,7 @@ do
 			echo
 			cd $MIRROR
 			THISNUM=$((THISNUM + 1))
-			if [ $THISARCH = "src" ] ; then
+			if [ $THISARCH = "source" ] ; then
 				echo "Creating CD$CDNUM for source (part $THISNUM)"
 			else
 				echo "Creating CD$CDNUM for binary-$THISARCH (part $THISNUM)"
@@ -223,7 +229,7 @@ do
 		fi
 
         case "$THISARCH" in
-            src)
+            source)
 				case "$file" in
 					*.gz|*.dsc)
 						copy_file $UPD/CD$CDNUM $file