Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Merge update-cd changes across from the version in etch.

This commit is contained in:
Steve McIntyre 2007-09-01 22:58:48 +00:00
parent dd8d42703b
commit 2a2dd08f4d
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -74,6 +74,7 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
Release files. Closes: #423835, thanks to fjp for the patch. Release files. Closes: #423835, thanks to fjp for the patch.
* Check if required base packages might also be supplied by a local * Check if required base packages might also be supplied by a local
repository too, not just the main distribution. Closes: #425600 repository too, not just the main distribution. Closes: #425600
* Merge update-cd changes across from the version in etch.
-- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2007 18:57:05 -0700 -- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2007 18:57:05 -0700

50
update-cd
View File

@ -24,7 +24,7 @@ MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian
NONFREE=0 NONFREE=0
# What release version is this? # What release version is this?
VER=3.1r5 VER=4.0r1
# Is this an official CD? # Is this an official CD?
OFFICIAL=Official OFFICIAL=Official
@ -38,13 +38,13 @@ MKISOFS=$PWD/../mkisofs/usr/bin/mkisofs
JTE=1 JTE=1
# The working directory to use. MUST be on the same partition as the mirror. # The working directory to use. MUST be on the same partition as the mirror.
TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/sarge-update/cd-work TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/etch-update/cd-work
# Building woody cd set ... # Building etch cd set ...
CODENAME=sarge CODENAME=etch
# Path where the images will be written # Path where the images will be written
OUT=/org/cdbuilder.debian.org/src/deb-cd/tmp/sarge-update/cd-out OUT=/org/cdbuilder.debian.org/src/deb-cd/tmp/etch-update/cd-out
# Location(s) for the snapshot(s) # Location(s) for the snapshot(s)
SNAPSHOT='Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/ --try-last' 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 # 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,
# which is probably less accurate. # which is probably less accurate.
DIFF=/home/deb-cd/r0-r5.diff.full DIFF=/home/deb-cd/r0-r1.diff
if [ "$TYPE" = "cd" ] ; then if [ "$TYPE" = "cd" ] ; then
CDSIZE=610 # megabytes, leaving space for metadata CDSIZE=610 # megabytes, leaving space for metadata
@ -96,7 +96,7 @@ CAPCODE=`perl -e "print ucfirst("$CODENAME")"`
export FIRSTVER VERSPACE CAPCODE export FIRSTVER VERSPACE CAPCODE
if [ "$ARCHLIST"x = ""x ] ; then if [ "$ARCHLIST"x = ""x ] ; then
ARCHLIST="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source" # amd64 # all dealt with specially ARCHLIST="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source" # amd64 # all dealt with specially
else else
ARCHLIST=$@ ARCHLIST=$@
fi fi
@ -189,24 +189,24 @@ make_cd () {
if [ ! -d $OUT/$THISARCH/jigdo-$TYPE ] ; then if [ ! -d $OUT/$THISARCH/jigdo-$TYPE ] ; then
mkdir -p $OUT/$THISARCH/jigdo-$TYPE mkdir -p $OUT/$THISARCH/jigdo-$TYPE
fi fi
${MKISOFS} -J -r -V "Debian $VER update" -o \ ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
$OUT/$THISARCH/iso-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.iso \ $OUT/$THISARCH/iso-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.iso \
-jigdo-jigdo $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.jigdo \ -jigdo-jigdo $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.jigdo \
-jigdo-template $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.template \ -jigdo-template $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$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 \ $BASEDIR/tools/jigdo_cleanup \
$OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.jigdo \ $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.jigdo \
debian-update-$VER-$THISARCH-$THISNUM.iso \ debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.iso \
$OUT debian-update-$VER-$THISARCH-$THISNUM.template \ $OUT debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.template \
"Debian GNU/Linux $VERSPACE - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM" "Debian GNU/Linux $VERSPACE - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM"
echo $SNAPSHOT >> $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$THISNUM.jigdo echo $SNAPSHOT >> $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.jigdo
else else
${MKISOFS} -J -r -V "Debian $VER update CD" -o \ ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
$OUT/iso-$TYPE/$CODENAME-update-$THISARCH-$THISNUM.raw \ $OUT/iso-$TYPE/$CODENAME-update-$THISARCH-$TYPEUP-$THISNUM.raw \
$UPD/CD$CDNUM 2>&1 | grep "extents written" $UPD/CD$CDNUM 2>&1 | grep "extents written"
fi fi
} }
@ -240,16 +240,12 @@ for THISARCH in $ARCHLIST
do do
THISNUM=0 THISNUM=0
if [ $THISARCH = amd64 ] ; then MIRROR=$MIRROR_NORM
MIRROR=$MIRROR_AMD64
else
MIRROR=$MIRROR_NORM
fi
rm -f $UPD/md5-check rm -f $UPD/md5-check
$GRAB_MD5 $MIRROR $THISARCH $CODENAME $UPD/md5-check $GRAB_MD5 $MIRROR $THISARCH $CODENAME $CODENAME $UPD/md5-check
if [ "$NONUS"x != ""x ] ; then if [ "$NONUS"x != ""x ] ; then
$GRAB_MD5 $NONUS $THISARCH $CODENAME $UPD/md5-check $GRAB_MD5 $NONUS $THISARCH $CODENAME $CODENAME $UPD/md5-check
fi fi
for file in `cat $UPD/list` for file in `cat $UPD/list`
@ -259,12 +255,12 @@ do
cd $MIRROR cd $MIRROR
THISNUM=$((THISNUM + 1)) THISNUM=$((THISNUM + 1))
if [ $THISARCH = "source" ] ; then if [ $THISARCH = "source" ] ; then
echo "Creating CD$CDNUM for source (part $THISNUM)" echo "Creating $TYPEUP$CDNUM for source (part $THISNUM)"
else else
echo "Creating CD$CDNUM for binary-$THISARCH (part $THISNUM)" echo "Creating $TYPEUP$CDNUM for binary-$THISARCH (part $THISNUM)"
fi fi
mkdir $UPD/CD$CDNUM $UPD/CD$CDNUM/.disk mkdir $UPD/CD$CDNUM $UPD/CD$CDNUM/.disk
INFO="Debian GNU/Linux $VER Update CD $DATE: $THISARCH CD $THISNUM" INFO="Debian GNU/Linux $VER Update $TYPEUP $DATE: $THISARCH $TYPEUP $THISNUM"
echo $INFO > $UPD/CD$CDNUM/.disk/info echo $INFO > $UPD/CD$CDNUM/.disk/info
SIZE_USED=0 SIZE_USED=0
SRCFILES=0 SRCFILES=0