update-cd: if we're doing torrents, make sure we include update CD

checksums in bt-$type too.
This commit is contained in:
Steve McIntyre 2015-02-07 23:15:57 +00:00
parent 8fb7c759b0
commit 7cd4192b40
2 changed files with 11 additions and 0 deletions

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
* Add minor support / bug fixes for i386 EFI.
* Add fine-grained control over usage of BIOS and EFI boot on x86 CDs,
needed for extra Mac CD builds.
* update-cd: if we're doing torrents, make sure we include update CD
checksums in bt-$type too.
-- Steve McIntyre <93sam@debian.org> Wed, 29 Oct 2014 17:33:10 +0000

View File

@ -33,6 +33,9 @@ MKISOFS="$PWD/../genisoimage -jigdo-template-compress bzip2 -r -checksum_algorit
# Use JTE extensions to mkisofs to make jigdo files?
JTE=1
# Set up torrents too?
BT=1
# The working directory to use. MUST be on the same partition as the mirror.
TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/squeeze-update/cd-work
@ -141,6 +144,7 @@ make_cd () {
ISODIR=$OUT/$THISARCH/iso-$TYPE
JIGDODIR=$OUT/$THISARCH/jigdo-$TYPE
LISTDIR=$OUT/$THISARCH/list-$TYPE
BTDIR=$OUT/$THISARCH/bt-$TYPE
if [ ! -d ${ISODIR} ] ; then
mkdir -p ${ISODIR}
@ -151,6 +155,9 @@ make_cd () {
if [ ! -d ${LISTDIR} ] ; then
mkdir -p ${LISTDIR}
fi
if [ $BT = 1 ] && [ ! -d ${BTDIR} ] ; then
mkdir -p ${BTDIR}
fi
if [ $JTE = 1 ] ; then
set +e
@ -180,6 +187,7 @@ make_cd () {
awk '/Image Hex MD5Sum/ {print $5}'`
echo "$MD5 ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update
echo "$MD5 ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update
[ $BT = 1 ] && echo "$MD5 ${BASENAME}.iso" >> ${BTDIR}/MD5SUMS.update
for SHA_SIZE in 1 256 512; do
SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \
awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"`
@ -189,6 +197,7 @@ make_cd () {
fi
echo "$SHA ${BASENAME}.iso" >> ${JIGDODIR}/SHA${SHA_SIZE}SUMS.update
echo "$SHA ${BASENAME}.iso" >> ${ISODIR}/SHA${SHA_SIZE}SUMS.update
[ $BT = 1 ] && echo "$SHA ${BASENAME}.iso" >> ${BTDIR}/SHA${SHA_SIZE}SUMS.update
done
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo