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

When generating both iso and jigdo files, make sure that the iso files 

are at least as new as the jigdo files, as this helps people
mirroring. Closes: #587774
This commit is contained in:
Steve McIntyre 2010-07-02 22:43:46 +00:00
parent 880875a3e4
commit 7f32c206e3
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -26,6 +26,9 @@ debian-cd (3.1.4) UNRELEASED; urgency=low
* Add top-level control of which checksums are desired for output images * Add top-level control of which checksums are desired for output images
see the CHECKSUMS setting in CONF.sh see the CHECKSUMS setting in CONF.sh
* Fix some bashisms in tools/apt-selection. * Fix some bashisms in tools/apt-selection.
* When generating both iso and jigdo files, make sure that the iso files
are at least as new as the jigdo files, as this helps people mirroring.
Closes: #587774
-- Steve McIntyre <93sam@debian.org> Tue, 27 Feb 2010 12:24:29 +0100 -- Steve McIntyre <93sam@debian.org> Tue, 27 Feb 2010 12:24:29 +0100

4
tools/make_image
View File

@ -128,5 +128,9 @@ do
"`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \ "`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \
"$DISKINFO" \ "$DISKINFO" \
$JIGDOFALLBACKURLS $JIGDOFALLBACKURLS
if [ "$ISO_WANTED" = 1 ] ; then
# Make sure that the ISO is as new/newer than the jigdo file; #587774
touch $OUT/$OUTFILE.iso
fi
fi fi
done done

2
update-cd
View File

@ -202,6 +202,8 @@ make_cd () {
$OUT debian-update-$VER-$THISARCH-$TYPEUP-$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-$TYPEUP-$THISNUM.jigdo echo $SNAPSHOT >> $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.jigdo
# Make sure that the ISO is as new/newer than the jigdo file; #587774
touch $OUT/$THISARCH/iso-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.iso
else else
${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \ ${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
$OUT/iso-$TYPE/$CODENAME-update-$THISARCH-$TYPEUP-$THISNUM.iso \ $OUT/iso-$TYPE/$CODENAME-update-$THISARCH-$TYPEUP-$THISNUM.iso \