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

Add links to snapshot.debian.org into jigdo files

This commit is contained in:
Steve McIntyre 2011-07-01 12:26:05 +00:00
parent 5e163ee81a
commit 264d8436bd
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -148,6 +148,7 @@ endif
endif endif
$(BDIR)/DATE: $(BDIR)/DATE:
$(Q)date '+%Y%m%d' > $(BDIR)/DATE $(Q)date '+%Y%m%d' > $(BDIR)/DATE
$(Q)date '+%Y%m%dT%H%M%SZ' > $(BDIR)/DATE-zulu
ifdef MIRROR ifdef MIRROR
LATEST_DB := $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debootstrap) LATEST_DB := $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debootstrap)

1
debian/changelog vendored
View File

@ -36,6 +36,7 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
tools/generate_firmware_task. tools/generate_firmware_task.
* Add apt-offline to tasks/wheezy/forcd1 to bring it onto CD#1. * Add apt-offline to tasks/wheezy/forcd1 to bring it onto CD#1.
Closes: #630805 Closes: #630805
* Add links to snapshot.debian.org into jigdo files.
[ Aurelien Jarno ] [ Aurelien Jarno ]
* Add support for hurd-i386. Closes: #619211 * Add support for hurd-i386. Closes: #619211

6
tools/jigdo_cleanup
View File

@ -15,6 +15,7 @@ iso="$2" # The name to give to the .iso
dirpath="$3" # The disc build tree dirpath="$3" # The disc build tree
template="$4" # URL for .template file, can be relative URL template="$4" # URL for .template file, can be relative URL
discinfo="$5" # e.g. "Debian GNU/Linux 3.0 r1 "Woody" - Unofficial i386 Binary-1" discinfo="$5" # e.g. "Debian GNU/Linux 3.0 r1 "Woody" - Unofficial i386 Binary-1"
snapurl="$6" # URL for snapshot.d.o. e.g. http://snapshot.debian.org/archive/debian/20110630T000000Z/
# any further parameters are fallback URLs # any further parameters are fallback URLs
info="Generated on "`date -R` info="Generated on "`date -R`
@ -39,6 +40,11 @@ cat $jigdo | awk -v ISO="$iso" -v TEMPLATE="$template" -v DISCINFO="$discinfo" -
' > $jigdo.1 ' > $jigdo.1
mv -f $jigdo.1 $jigdo mv -f $jigdo.1 $jigdo
# Snapshot URL
if [ "$snapurl"x != ""x ] ; then
echo "$snapurl" >> $jigdo
fi
# If some fallbacks were specified, output a servers section with the # If some fallbacks were specified, output a servers section with the
# URLs. The entries of the variable are expected to be already of the # URLs. The entries of the variable are expected to be already of the
# form "Label=http://some.url/" # form "Label=http://some.url/"

3
tools/make_image
View File

@ -129,10 +129,13 @@ do
# If we've made jigdo files, tweak them with extra info now # If we've made jigdo files, tweak them with extra info now
if [ "$JIGDO_WANTED" = 1 ] ; then if [ "$JIGDO_WANTED" = 1 ] ; then
SNAPSSHOT_DATE=`cat $DIR/DATE-zulu`
SNAPSHOTURL="http://snapshot.debian.org/archive/debian/$SNAPSHOT_DATE/"
$JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \ $JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \
$OUTFILE.iso $DIR/CD$n \ $OUTFILE.iso $DIR/CD$n \
"`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \ "`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \
"$DISKINFO" \ "$DISKINFO" \
$SNAPSHOTURL \
$JIGDOFALLBACKURLS $JIGDOFALLBACKURLS
if [ "$ISO_WANTED" = 1 ] ; then if [ "$ISO_WANTED" = 1 ] ; then
# Make sure that the ISO is as new/newer than the jigdo file; #587774 # Make sure that the ISO is as new/newer than the jigdo file; #587774