* Multiple update-cd changes:
+ Merged and simplified the old functionality from scansources.old
and scanpackages.old into the new script create_control.
+ Run the mkisofs step *outside* of "set -e" so that we can actually
report errors instead of silently failing.
+ Split out the code for starting a new disc into a function.
+ Pick up on a potential bug: if we finish the last (expected) disc with
a backed-out file, make sure we create another image to include that
file too.
This commit is contained in:
Steve McIntyre
parent
f93d21bdf1
commit
b59da3abd7
|
|
@ -38,6 +38,17 @@ debian-cd (3.1.6) UNRELEASED-backport; urgency=low
|
|||
* Remove the checked-in firmware task altogether, as it's not
|
||||
useful. Generate it when needed using the new script
|
||||
tools/generate_firmware_task.
|
||||
+ Remove the old non-US stuff from it, it's not been needed in years.
|
||||
+ Cope with .bz2 source files too.
|
||||
* Multiple update-cd changes:
|
||||
+ Merged and simplified the old functionality from scansources.old
|
||||
and scanpackages.old into the new script create_control.
|
||||
+ Run the mkisofs step *outside* of "set -e" so that we can actually
|
||||
report errors instead of silently failing.
|
||||
+ Split out the code for starting a new disc into a function.
|
||||
+ Pick up on a potential bug: if we finish the last (expected) disc with
|
||||
a backed-out file, make sure we create another image to include that
|
||||
file too.
|
||||
|
||||
-- Raphaël Hertzog <hertzog@debian.org> Fri, 04 Feb 2011 09:59:21 +0100
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian
|
|||
NONFREE=0
|
||||
|
||||
# What release version is this?
|
||||
VER=6.0.1a
|
||||
VER=6.0.2.1
|
||||
|
||||
# Is this an official CD?
|
||||
OFFICIAL=Official
|
||||
|
|
@ -66,7 +66,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/debian-cd/lists/squeeze/r0-r1.diff
|
||||
DIFF=/home/debian-cd/lists/squeeze/r0-r2.diff
|
||||
|
||||
if [ "$TYPE" = "cd" ] ; then
|
||||
CDSIZE=644 # megabytes, leaving space for metadata
|
||||
|
|
@ -153,6 +153,7 @@ make_cd () {
|
|||
fi
|
||||
|
||||
if [ $JTE = 1 ] ; then
|
||||
set +e
|
||||
${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
|
||||
${ISODIR}/${BASENAME}.iso \
|
||||
-jigdo-jigdo ${JIGDODIR}/${BASENAME}.jigdo \
|
||||
|
|
@ -161,6 +162,11 @@ make_cd () {
|
|||
-jigdo-force-md5 /pool/ \
|
||||
-md5-list $UPD/md5-check \
|
||||
$UPD/CD$CDNUM 2>&1 | grep "extents written"
|
||||
if [ $? -ne 0 ] ; then
|
||||
echo "${MKISOFS} failed, error $?"
|
||||
exit 1
|
||||
fi
|
||||
set -e
|
||||
$BASEDIR/tools/jigdo_cleanup \
|
||||
${JIGDODIR}/${BASENAME}.jigdo \
|
||||
${BASENAME}.iso \
|
||||
|
|
@ -187,9 +193,15 @@ make_cd () {
|
|||
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
|
||||
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
|
||||
else
|
||||
set +e
|
||||
${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
|
||||
$OUT/iso-$TYPE/${BASENAME}.iso \
|
||||
$UPD/CD$CDNUM 2>&1 | grep "extents written"
|
||||
if [ $? -ne 0 ] ; then
|
||||
echo "${MKISOFS} failed, error $?"
|
||||
exit 1
|
||||
fi
|
||||
set -e
|
||||
fi
|
||||
find $UPD/CD$CDNUM/pool -type f | sed 's?^.*/??g' | gzip -9 > ${LISTDIR}/${BASENAME}.list.gz
|
||||
}
|
||||
|
|
@ -222,6 +234,24 @@ add_file () {
|
|||
esac
|
||||
}
|
||||
|
||||
start_new_disc () {
|
||||
echo
|
||||
cd $MIRROR
|
||||
THISNUM=$((THISNUM + 1))
|
||||
if [ $THISARCH = "source" ] ; then
|
||||
echo "Creating $TYPEUP$CDNUM for source (part $THISNUM)"
|
||||
else
|
||||
echo "Creating $TYPEUP$CDNUM for binary-$THISARCH (part $THISNUM)"
|
||||
fi
|
||||
mkdir $UPD/CD$CDNUM $UPD/CD$CDNUM/.disk
|
||||
INFO="Debian GNU/Linux $VER Update $TYPEUP $DATE: $THISARCH $TYPEUP $THISNUM"
|
||||
echo $INFO > $UPD/CD$CDNUM/.disk/info
|
||||
SIZE_USED=0
|
||||
SRCFILES=0
|
||||
ARCHFILES=0
|
||||
ALLFILES=0
|
||||
}
|
||||
|
||||
echo Cleaning up
|
||||
rm -rf $UPD
|
||||
mkdir -p $UPD
|
||||
|
|
@ -254,21 +284,7 @@ do
|
|||
for file in `cat $UPD/list`
|
||||
do
|
||||
if [ ! -d $UPD/CD$CDNUM ] ; then
|
||||
echo
|
||||
cd $MIRROR
|
||||
THISNUM=$((THISNUM + 1))
|
||||
if [ $THISARCH = "source" ] ; then
|
||||
echo "Creating $TYPEUP$CDNUM for source (part $THISNUM)"
|
||||
else
|
||||
echo "Creating $TYPEUP$CDNUM for binary-$THISARCH (part $THISNUM)"
|
||||
fi
|
||||
mkdir $UPD/CD$CDNUM $UPD/CD$CDNUM/.disk
|
||||
INFO="Debian GNU/Linux $VER Update $TYPEUP $DATE: $THISARCH $TYPEUP $THISNUM"
|
||||
echo $INFO > $UPD/CD$CDNUM/.disk/info
|
||||
SIZE_USED=0
|
||||
SRCFILES=0
|
||||
ARCHFILES=0
|
||||
ALLFILES=0
|
||||
start_new_disc
|
||||
fi
|
||||
|
||||
if [ "$BACKOUT_FILE"x != ""x ] ; then
|
||||
|
|
@ -295,6 +311,19 @@ do
|
|||
fi
|
||||
done
|
||||
|
||||
echo
|
||||
echo "Making last disc in set for $THISARCH: size $SIZE_USED, BACKOUT_FILE \"$BACKOUT_FILE\""
|
||||
# Catch the case where we still have a backout file at the very
|
||||
# end of the set
|
||||
if [ "$BACKOUT_FILE"x != ""x ] ; then
|
||||
if [ ! -d $UPD/CD$CDNUM ] ; then
|
||||
start_new_disc
|
||||
fi
|
||||
echo "Starting last disc with backed-out file $BACKOUT_FILE"
|
||||
add_file $BACKOUT_FILE
|
||||
BACKOUT_FILE=""
|
||||
fi
|
||||
|
||||
make_cd $CDNUM $THISNUM $THISARCH $SRCFILES $ARCHFILES $ALLFILES
|
||||
CDNUM=$(($CDNUM + 1))
|
||||
done
|
||||
|
|
|
|||
Loading…
Reference in New Issue