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

Fix ordering for checksums in update-cd 

Make sure compress the .jigdo files *before* we checksum them!
This commit is contained in:
Steve McIntyre 2019-01-26 21:36:57 +00:00
parent f0f6678634
commit 6a51923ead
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
update-cd
View File

@ -178,10 +178,12 @@ make_cd () {
$OUT ${BASENAME}.template \ $OUT ${BASENAME}.template \
"Debian ${DEBIAN_KERNEL} $VER - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM" "Debian ${DEBIAN_KERNEL} $VER - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM"
echo $SNAPSHOT >> ${JIGDODIR}/${BASENAME}.jigdo echo $SNAPSHOT >> ${JIGDODIR}/${BASENAME}.jigdo
# Make sure that the ISO is as new/newer than the jigdo file; #587774
touch ${ISODIR}/${BASENAME}.iso
MD5=`cat ${JIGDODIR}/${BASENAME}.jigdo | \ # Make sure we compres the jigdo file *before* we checksum it
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
MD5=`zcat ${JIGDODIR}/${BASENAME}.jigdo | \
awk '/Image Hex MD5Sum/ {print $5}'` awk '/Image Hex MD5Sum/ {print $5}'`
echo "$MD5 ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update echo "$MD5 ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update
echo "$MD5 ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update echo "$MD5 ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update
@ -192,7 +194,7 @@ make_cd () {
(cd ${BTDIR} && md5sum ${BASENAME}.iso.torrent >> MD5SUMS.update) (cd ${BTDIR} && md5sum ${BASENAME}.iso.torrent >> MD5SUMS.update)
fi fi
for SHA_SIZE in 1 256 512; do for SHA_SIZE in 1 256 512; do
SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \ SHA=`zcat ${JIGDODIR}/${BASENAME}.jigdo | \
awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"` awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"`
if [ "$SHA"x = ""x ] ; then if [ "$SHA"x = ""x ] ; then
echo "SHA fail" echo "SHA fail"
@ -206,8 +208,9 @@ make_cd () {
(cd ${BTDIR} && sha${SHA_SIZE}sum ${BASENAME}.iso.torrent >> SHA${SHA_SIZE}SUMS.update) (cd ${BTDIR} && sha${SHA_SIZE}sum ${BASENAME}.iso.torrent >> SHA${SHA_SIZE}SUMS.update)
fi fi
done done
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo # Make sure that the ISO is as new/newer than the jigdo file; #587774
touch ${ISODIR}/${BASENAME}.iso
else else
set +e set +e
${MKISOFS} -J -joliet-long -r -V "Debian $VER update $TYPEUP" -o \ ${MKISOFS} -J -joliet-long -r -V "Debian $VER update $TYPEUP" -o \