From 8fdeccf7e448a027d32b9f12bae144d2bc6d2a0e Mon Sep 17 00:00:00 2001 From: cd-builder user Date: Wed, 26 May 2010 17:20:59 +0000 Subject: [PATCH] Multiple updates: * changed default locations for the farbror to pettersson move * genisoimage has moved, and we want to do more checksums that way * grab md5 data for packages for *all* arches; have to cope with binary-all files that mighe be stale. :-( --- etch/update-cd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etch/update-cd b/etch/update-cd index bb38c4f6..00bd9c10 100755 --- a/etch/update-cd +++ b/etch/update-cd @@ -14,7 +14,7 @@ set -e # Configuration goes here. # Where is your mirror? -MIRROR_NORM=/org/cdbuilder.debian.org/src/ftp/debian +MIRROR_NORM=/mnt/cd-raid0/ftp/debian/ MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian # If you have a non-US mirror, where is it? Leave blank if you don't have one. @@ -24,7 +24,7 @@ MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian NONFREE=0 # What release version is this? -VER=4.0r5 +VER=4.0r9 # Is this an official CD? OFFICIAL=Official @@ -32,19 +32,19 @@ OFFICIAL=Official # Path to use with mkisofs/mkhybrid #MKISOFS=${MKISOFS:-"mkhybrid"} -MKISOFS=$PWD/../genisoimage/usr/bin/genisoimage +MKISOFS="$PWD/../genisoimage -jigdo-template-compress bzip2 -r -checksum_algorithm_iso md5,sha1,sha256,sha512" # 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=/org/cdbuilder.debian.org/src/deb-cd/tmp/etch-update/cd-work +TDIR=/mnt/cd-raid0/deb-cd/tmp/etch-update/cd-work # Building etch cd set ... CODENAME=etch # Path where the images will be written -OUT=/org/cdbuilder.debian.org/src/deb-cd/tmp/etch-update/cd-out +OUT=/mnt/cd-raid0/deb-cd/tmp/etch-update/cd-out # Location(s) for the snapshot(s) SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last' @@ -70,7 +70,7 @@ esac # 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=/home/deb-cd/r0-r5.diff +DIFF=/home/debian-cd/lists/etch/r0-r9.diff if [ "$TYPE" = "cd" ] ; then CDSIZE=610 # megabytes, leaving space for metadata @@ -252,9 +252,9 @@ do MIRROR=$MIRROR_NORM rm -f $UPD/md5-check - $GRAB_MD5 $MIRROR $THISARCH $CODENAME $CODENAME $UPD/md5-check + $GRAB_MD5 $MIRROR "$ARCHLIST" $CODENAME $CODENAME $UPD/md5-check if [ "$NONUS"x != ""x ] ; then - $GRAB_MD5 $NONUS $THISARCH $CODENAME $CODENAME $UPD/md5-check + $GRAB_MD5 $NONUS "$ARCHLIST" $CODENAME $CODENAME $UPD/md5-check fi for file in `cat $UPD/list`