More cleanups for the first sarge point release. Make the update CDs easier to produce...
This commit is contained in:
parent
f8f6b90b2a
commit
4e363bef36
26
update-cd
26
update-cd
|
@ -26,6 +26,10 @@ NONFREE=1
|
||||||
# What release version is this?
|
# What release version is this?
|
||||||
VER=3.1r1
|
VER=3.1r1
|
||||||
|
|
||||||
|
# Is this an official CD?
|
||||||
|
OFFICIAL=Official
|
||||||
|
# OFFICIAL="Unofficial snapshot"
|
||||||
|
|
||||||
# Path to use with mkisofs/mkhybrid
|
# Path to use with mkisofs/mkhybrid
|
||||||
#MKISOFS=${MKISOFS:-"mkhybrid"}
|
#MKISOFS=${MKISOFS:-"mkhybrid"}
|
||||||
MKISOFS=mkisofs
|
MKISOFS=mkisofs
|
||||||
|
@ -40,7 +44,10 @@ TDIR=/mirror/sarge-update
|
||||||
CODENAME=sarge
|
CODENAME=sarge
|
||||||
|
|
||||||
# Path where the images will be written
|
# Path where the images will be written
|
||||||
OUT=/mirror/sarge-update/r1
|
OUT=/mirror/sarge-update
|
||||||
|
|
||||||
|
# Location(s) for the snapshot(s)
|
||||||
|
SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last'
|
||||||
|
|
||||||
# Location of the diff file to use to determine the changes. If you leave
|
# 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,
|
# this blank, we'll try to determine the changes from the ChangeLog files,
|
||||||
|
@ -59,6 +66,13 @@ VERBOSE=2
|
||||||
GRAB_MD5=$BASEDIR/tools/grab_md5
|
GRAB_MD5=$BASEDIR/tools/grab_md5
|
||||||
export VERBOSE BASEDIR SECTS
|
export VERBOSE BASEDIR SECTS
|
||||||
|
|
||||||
|
|
||||||
|
FIRSTVER=`echo $VER | sed 's?r.*$?r0?g'`
|
||||||
|
VERSPACE=`echo $VER | sed 's?r? r?g'`
|
||||||
|
CAPCODE=`perl -e "print ucfirst("$CODENAME")"`
|
||||||
|
|
||||||
|
export FIRSTVER VERSPACE CAPCODE
|
||||||
|
|
||||||
ARCHLIST="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source" # amd64 # 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
|
export TDIR NONFREE NONUS VER MIRROR CODENAME OUT BASEDIR
|
||||||
|
@ -145,13 +159,19 @@ make_cd () {
|
||||||
if [ $JTE = 1 ] ; then
|
if [ $JTE = 1 ] ; then
|
||||||
${MKISOFS} -J -r -V "Debian $VER update CD" -o \
|
${MKISOFS} -J -r -V "Debian $VER update CD" -o \
|
||||||
/dev/null \
|
/dev/null \
|
||||||
-jigdo-jigdo $OUT/$CODENAME-update-$THISARCH-$THISNUM.jigdo \
|
-jigdo-jigdo $OUT/debian-update-$VER-$THISARCH-$THISNUM.jigdo \
|
||||||
-jigdo-template $OUT/$CODENAME-update-$THISARCH-$THISNUM.template \
|
-jigdo-template $OUT/debian-update-$VER-$THISARCH-$THISNUM.template \
|
||||||
-jigdo-map Debian=$MIRROR/ \
|
-jigdo-map Debian=$MIRROR/ \
|
||||||
-jigdo-map Non-US=$NONUS/ \
|
-jigdo-map Non-US=$NONUS/ \
|
||||||
-jigdo-force-md5 /pool/ \
|
-jigdo-force-md5 /pool/ \
|
||||||
-md5-list $UPD/md5-check \
|
-md5-list $UPD/md5-check \
|
||||||
$UPD/CD$CDNUM 2>&1 | grep "extents written"
|
$UPD/CD$CDNUM 2>&1 | grep "extents written"
|
||||||
|
$BASEDIR/tools/jigdo_cleanup \
|
||||||
|
$OUT/debian-update-$VER-$THISARCH-$THISNUM.jigdo \
|
||||||
|
debian-update-$VER-$THISARCH-$THISNUM.iso \
|
||||||
|
$OUT debian-update-$VER-$THISARCH-$THISNUM.template \
|
||||||
|
"Debian GNU/Linux $VERSPACE - $OFFICIAL $THISARCH $FIRSTVER->$VER update CD #$THISNUM"
|
||||||
|
echo $SNAPSHOT >> $OUT/debian-update-$VER-$THISARCH-$THISNUM.jigdo
|
||||||
else
|
else
|
||||||
${MKISOFS} -J -r -V "Debian $VER update CD" -o \
|
${MKISOFS} -J -r -V "Debian $VER update CD" -o \
|
||||||
$OUT/$CODENAME-update-$THISARCH-$THISNUM.raw \
|
$OUT/$CODENAME-update-$THISARCH-$THISNUM.raw \
|
||||||
|
|
Loading…
Reference in New Issue