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 configuration for the snapshot.d.o URL

This commit is contained in:
Steve McIntyre 2011-07-01 12:36:59 +00:00
parent 264d8436bd
commit 21ce30d63d
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONF.sh
View File

@ -324,6 +324,11 @@ for INCL in $JIGDO_INCLUDE; do
JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL" JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL"
done done
# Base link for snapshot.debian.org or similar
# "SNAPDATETIME" will be replaced at runtime with the correct data
# Leave this unset to not add this entry
export SNAPURL=http://snapshot.debian.org/archive/debian/SNAPDATETIME/
# File with list of packages to include when fetching modules for the # File with list of packages to include when fetching modules for the
# first stage installer (debian-installer). One package per line. # first stage installer (debian-installer). One package per line.
# Lines starting with '#' are comments. The package order is # Lines starting with '#' are comments. The package order is

4
Makefile
View File

@ -147,8 +147,8 @@ ifeq ($(FORCE_FIRMWARE),1)
endif endif
endif endif
$(BDIR)/DATE: $(BDIR)/DATE:
$(Q)date '+%Y%m%d' > $(BDIR)/DATE $(Q)date -u '+%Y%m%d' > $(BDIR)/DATE
$(Q)date '+%Y%m%dT%H%M%SZ' > $(BDIR)/DATE-zulu $(Q)date -u '+%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)

5
debian/CONF.sh vendored
View File

@ -324,6 +324,11 @@ for INCL in $JIGDO_INCLUDE; do
JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL" JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL"
done done
# Base link for snapshot.debian.org or similar
# "SNAPDATETIME" will be replaced at runtime with the correct data
# Leave this unset to not add this entry
export SNAPURL=http://snapshot.debian.org/archive/debian/SNAPDATETIME/
# File with list of packages to include when fetching modules for the # File with list of packages to include when fetching modules for the
# first stage installer (debian-installer). One package per line. # first stage installer (debian-installer). One package per line.
# Lines starting with '#' are comments. The package order is # Lines starting with '#' are comments. The package order is

8
tools/make_image
View File

@ -129,13 +129,15 @@ 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` SNAPSHOT_DATE=`cat $DIR/DATE-zulu`
SNAPSHOTURL="http://snapshot.debian.org/archive/debian/$SNAPSHOT_DATE/" if [ "$SNAPURL"x != ""x ] ; then
SNAPSHOTURL=`echo "$SNAPURL" | sed "s/SNAPDATETIME/$SNAPSHOT_DATE/g"`
fi
$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 \ "$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