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

Updates for update-cd 

Grab checksums from the binary-all Packages.gz too when building
Generate checksums for torrents and jigdo files too if desired
This commit is contained in:
Steve McIntyre 2018-07-14 13:05:06 +01:00
parent c86bc763e3
commit abc2a7e74d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -6,6 +6,10 @@ debian-cd (3.1.22) UNRELEASED; urgency=medium
* List jigdo, template and torrent files in SUMS files too * List jigdo, template and torrent files in SUMS files too
* Tweak the date used for snapshot.d.o references - use *tomorrow* * Tweak the date used for snapshot.d.o references - use *tomorrow*
rather than today, to allow time for the snapshot to be updated. rather than today, to allow time for the snapshot to be updated.
* [update-cd] Grab checksums from the binary-all Packages.gz too when
building
* [update-cd] Generate checksums for torrents and jigdo files too if
desired.
[ David Kalnischkies ] [ David Kalnischkies ]
* Provide hashes for uncompressed Translation-* again. Closes: #767253 * Provide hashes for uncompressed Translation-* again. Closes: #767253

16
update-cd
View File

@ -166,6 +166,7 @@ make_cd () {
-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"
# $UPD/CD$CDNUM
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
echo "${MKISOFS} failed, error $?" echo "${MKISOFS} failed, error $?"
exit 1 exit 1
@ -184,7 +185,12 @@ make_cd () {
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
[ $BT = 1 ] && echo "$MD5 ${BASENAME}.iso" >> ${BTDIR}/MD5SUMS.update (cd ${JIGDODIR} && md5sum ${BASENAME}.jigdo ${BASENAME}.template >> MD5SUMS.update)
if [ $BT = 1 ]; then
~/build.${CODENAME}/mktorrent ${ISODIR}/${BASENAME}.iso
echo "$MD5 ${BASENAME}.iso" >> ${BTDIR}/MD5SUMS.update
(cd ${BTDIR} && md5sum ${BASENAME}.iso.torrent >> MD5SUMS.update)
fi
for SHA_SIZE in 1 256 512; do for SHA_SIZE in 1 256 512; do
SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \ SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \
awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"` awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"`
@ -194,7 +200,11 @@ make_cd () {
fi fi
echo "$SHA ${BASENAME}.iso" >> ${JIGDODIR}/SHA${SHA_SIZE}SUMS.update echo "$SHA ${BASENAME}.iso" >> ${JIGDODIR}/SHA${SHA_SIZE}SUMS.update
echo "$SHA ${BASENAME}.iso" >> ${ISODIR}/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 (cd ${JIGDODIR} && sha${SHA_SIZE}sum ${BASENAME}.jigdo ${BASENAME}.template >> SHA${SHA_SIZE}SUMS.update)
if [ $BT = 1 ]; then
echo "$SHA ${BASENAME}.iso" >> ${BTDIR}/SHA${SHA_SIZE}SUMS.update
(cd ${BTDIR} && sha${SHA_SIZE}sum ${BASENAME}.iso.torrent >> SHA${SHA_SIZE}SUMS.update)
fi
done done
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
@ -277,7 +287,7 @@ if [ "$NONFREE"x != "1"x ] ; then
mv -f $UPD/list1 $UPD/list mv -f $UPD/list1 $UPD/list
fi fi
$GRAB_MD5 $MIRROR_NORM "$ARCHLIST" $CODENAME $CODENAME $UPD/md5-check $GRAB_MD5 $MIRROR_NORM "$ARCHLIST all" $CODENAME $CODENAME $UPD/md5-check
for THISARCH in $ARCHLIST for THISARCH in $ARCHLIST
do do