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

sync up config updates into contrib

This commit is contained in:
cd-builder user 2009-08-22 22:44:44 +00:00
parent 897bc3af44
commit 6b58c4755e
5 changed files with 34415 additions and 31513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
contrib/cronjob.daily
View File

@ -8,6 +8,13 @@ export PUBDIRJIG=$PUBDIR/daily-builds
export PUBDIRISO=$PUBDIR/daily-builds
export DATE_BUILD="$DATE-$BUILDNUM"
# If we're doing a normal set of daily/weekly builds, leave the
# checksum filenames alone. Otherwise, make life easier for people
# combining things later and append a suitable name as we build.
if [ "$DEBVERSION"x != "testing"x ] ; then
export SUMS_EXTENSION=".small"
fi
finalise_arch_dir () {
ARCH=$1
INST_VER=$2
@ -20,8 +27,11 @@ finalise_arch_dir () {
zsyncmake -e -u *netinst*iso *netinst*iso > /dev/null
DATESTRING=`date -u`
sed "s/ARCH/$ARCH/g;s/DATE/$DATESTRING/g;s/BUILDNUM/$BUILDNUM/g;s/INST_VER/$INST_VER/g" $TOPDIR/daily.html > HEADER.html
$TOPDIR/debian-cd/tools/imagesums $ARCH_JIGDO_DIR
cp $ARCH_JIGDO_DIR/*SUMS $ARCH_ISO_DIR
$TOPDIR/debian-cd/tools/imagesums $ARCH_JIGDO_DIR $SUMS_EXTENSION
cp $ARCH_JIGDO_DIR/*SUMS* $ARCH_ISO_DIR
cd ..
~/build/mktorrent iso-cd/*iso
~/build/mklist iso-cd/*iso
cd $TOPDIR
fi
}
@ -29,7 +39,7 @@ finalise_arch_dir () {
export RSYNC_TARGET=/export/ftp/cdimage/daily-builds
if [ "$ARCHES"x = ""x ] ; then
ARCHES="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc sparc multi-arch"
ARCHES="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc sparc multi-arch"
fi
cd $TOPDIR &&
@ -40,6 +50,11 @@ if lockfile -r0 .debian-cd.lock ; then
. images4testing_d-i
# Allow desktop selection in isolinux menu for i386 and amd64
# For other arches this is a harmless no-op
export DESKTOP=all
export KERNEL_PARAMS="desktop=all"
for arch in $ARCHES; do
echo "Building $arch:"
if [ "$arch" = "multi-arch" ] ; then
@ -47,45 +62,67 @@ if lockfile -r0 .debian-cd.lock ; then
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL DI=sid DI_DIST="$DI_DIST" \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
DI_WWW_HOME=default ./testingcds "amd64 i386 powerpc"
echo " alpha/hppa/ia64 sid netinst"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
TASK=debian-installer+kernel LOGAPPEND="-2" \
MAXISOS=ALL MAXJIGDOS=ALL DI=sid DI_DIST="$DI_DIST" \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=sid DI_DIST="$DI_DIST" \
DI_WWW_HOME=default ./testingcds "alpha hppa ia64"
finalise_arch_dir $arch sid
rm -rf $PUBDIRISO/sid_d-i/$DATE_BUILD/multi-arch
mv $PUBDIRISO/sid_d-i/$DATE_BUILD/multi $PUBDIRISO/sid_d-i/$DATE_BUILD/multi-arch
echo " i386/amd64/ppc lenny netinst"
echo " i386/amd64/ppc squeeze netinst"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL DI=lenny DI_DIST="$DI_DIST" ./testingcds "amd64 i386 powerpc"
echo " alpha/hppa/ia64 lenny netinst"
MAXISOS=ALL MAXJIGDOS=ALL \
DI=squeeze DI_DIST="$DI_DIST" VARIANTS=xen \
./testingcds "amd64 i386 powerpc"
echo " alpha/hppa/ia64 squeeze netinst"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
TASK=debian-installer+kernel LOGAPPEND="-2" \
MAXISOS=ALL MAXJIGDOS=ALL DI=lenny DI_DIST="$DI_DIST" ./testingcds "alpha hppa ia64"
finalise_arch_dir $arch lenny
rm -rf $PUBDIRISO/lenny_d-i/$DATE_BUILD/multi-arch
mv $PUBDIRISO/lenny_d-i/$DATE_BUILD/multi $PUBDIRISO/lenny_d-i/$DATE_BUILD/multi-arch
MAXISOS=ALL MAXJIGDOS=ALL \
DI=squeeze DI_DIST="$DI_DIST" \
./testingcds "alpha hppa ia64"
finalise_arch_dir $arch squeeze
rm -rf $PUBDIRISO/squeeze_d-i/$DATE_BUILD/multi-arch
mv $PUBDIRISO/squeeze_d-i/$DATE_BUILD/multi $PUBDIRISO/squeeze_d-i/$DATE_BUILD/multi-arch
else # end of m-a
echo " $arch sid bc"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 TASK=debian-installer MAXISOS=ALL MAXJIGDOS=ALL DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" ./testingcds "$arch"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 \
TASK=debian-installer MAXISOS=ALL MAXJIGDOS=ALL \
DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" \
./testingcds "$arch"
echo " $arch sid netinst"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" ./testingcds "$arch"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" \
./testingcds "$arch"
finalise_arch_dir $arch sid
echo " $arch lenny bc"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 TASK=debian-installer MAXISOS=ALL MAXJIGDOS=ALL DI=lenny DI_DIST="$DI_DIST" ./testingcds "$arch"
echo " $arch lenny netinst"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL DI=lenny DI_DIST="$DI_DIST" ./testingcds "$arch"
finalise_arch_dir $arch lenny
echo " $arch squeeze bc"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 \
TASK=debian-installer MAXISOS=ALL MAXJIGDOS=ALL \
DI=squeeze DI_DIST="$DI_DIST" \
./testingcds "$arch"
echo " $arch squeeze netinst"
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
DI=squeeze DI_DIST="$DI_DIST" \
./testingcds "$arch"
finalise_arch_dir $arch squeeze
fi # end of normal arch build
done

89
contrib/cronjob.weekly
View File

@ -10,20 +10,39 @@ export DATE_BUILD="$DATE-$BUILDNUM"
export RSYNC_TARGET=/export/ftp/cdimage/weekly-builds
# If we're doing a normal set of daily/weekly builds, leave the
# checksum filenames alone. Otherwise, make life easier for people
# combining things later and append a suitable name as we build.
if [ "$DEBVERSION"x != "testing"x ] ; then
export SUMS_EXTENSION=".large"
fi
. images4testing_d-i
# Uncomment the following to use daily d-i builds for weekly images
# rather than what's in the archive
USE_DAILY_DI=Y
if [ "$USE_DAILY_DI"x = "Y"x ] ; then
export DI=sid
export DI_WWW_HOME=default
fi
export DI_DIST
export DI_CODENAME
OMIT_RELEASE_NOTES=0
export OMIT_RELEASE_NOTES
if [ "$ARCHES"x = ""x ] ; then
ARCHES="i386 source amd64 multi powerpc alpha arm armel hppa ia64 mips mipsel s390 sparc"
ARCHES="i386 source amd64 multi powerpc alpha armel hppa ia64 mips mipsel s390 sparc"
fi
if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
echo "svn update debian-cd"
cd debian-cd && svn cleanup; svn up ; cd ..
cd debian-cd && ./tools/update_popcon lenny ; cd ..
cd debian-cd && ./tools/update_popcon tasks/squeeze/popularity-contest ; cd ..
cd $TOPDIR
mkdir -p $PUBDIRJIG/trace
@ -38,25 +57,8 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
#export DI_DIR="$ARCH_DI_DIR"
# Full DVD set
if [ "$NODVD"x = ""x ] ; then
case $arch in
i386|amd64|source)
export MAXISOS=ALL; export MAXJIGDOS=ALL ;;
*)
export MAXISOS=1; export MAXJIGDOS=ALL ;;
esac
DVDSTART=`date -u +%H:%M:%S`
INSTALLER_CD=3 \
./testingcds "$arch"
error=$?
DVDEND=`date -u +%H:%M:%S`
echo "$arch DVDs started at $DVDSTART, ended at $DVDEND, error $error"
fi
# Full CD set
if [ "$NOCD"x = ""x ] ; then
export DESKTOP=gnome
case $arch in
i386|amd64|source)
export MAXISOS=ALL; export MAXJIGDOS=ALL ;;
@ -66,12 +68,31 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
export MAXISOS=3; export MAXJIGDOS=ALL ;;
esac
CDSTART=`date -u +%H:%M:%S`
unset DESKTOP
./testingcds "$arch"
error=$?
CDEND=`date -u +%H:%M:%S`
echo "$arch CDs started at $CDSTART, ended at $CDEND, error $error"
fi
# Full DVD set
if [ "$NODVD"x = ""x ] ; then
case $arch in
i386|amd64|source)
export MAXISOS=ALL; export MAXJIGDOS=ALL ;;
*)
export MAXISOS=1; export MAXJIGDOS=ALL ;;
esac
DVDSTART=`date -u +%H:%M:%S`
export DESKTOP=all
INSTALLER_CD=3 TASK=Debian-all \
KERNEL_PARAMS='desktop=all' \
./testingcds "$arch"
error=$?
DVDEND=`date -u +%H:%M:%S`
echo "$arch DVDs started at $DVDSTART, ended at $DVDEND, error $error"
fi
# Full BD set
if [ "$NOBD"x = ""x ] ; then
case $arch in
@ -79,7 +100,9 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
export MAXISOS=0
export MAXJIGDOS=ALL
BDSTART=`date -u +%H:%M:%S`
INSTALLER_CD=9 \
export DESKTOP=all
INSTALLER_CD=9 TASK=Debian-all \
KERNEL_PARAMS='desktop=all' \
./testingcds "$arch"
error=$?
BDEND=`date -u +%H:%M:%S`
@ -91,7 +114,7 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
esac
fi
# kde and xfce cds
# kde and xfce/lxde cds
if [ "$arch"x != "source"x ] && [ "$NOCD"x = ""x ] ; then
CDSTART=`date -u +%H:%M:%S`
export DESKTOP=kde
@ -105,15 +128,15 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
echo "$arch KDE CD started at $CDSTART, ended at $CDEND, error $error"
CDSTART=`date -u +%H:%M:%S`
export DESKTOP=xfce
export DESKTOP=light
export MAXISOS=1; export MAXJIGDOS=1
INSTALLER_CD=5 TASK=Debian-xfce \
KERNEL_PARAMS='desktop=xfce' \
INSTALLER_CD=B TASK=Debian-light \
KERNEL_PARAMS='desktop=light' \
MAXCDS=1 MAXISOS=ALL MAXJIGDOS=ALL \
./testingcds "$arch"
error=$?
CDEND=`date -u +%H:%M:%S`
echo "$arch Xfce CD started at $CDSTART, ended at $CDEND, error $error"
echo "$arch Xfce/LXDE CD started at $CDSTART, ended at $CDEND, error $error"
fi
if [ "$NOSYNC"x = ""x ] ; then
@ -128,16 +151,19 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
if [ "$NODVD"x = ""x ] ; then
DVDSTART=`date -u +%H:%M:%S`
MAXISOS=ALL MAXJIGDOS=ALL INSTALLER_CD=6 MAXCDS=1 \
./testingcds "i386 amd64 powerpc source"
export DESKTOP=all
INSTALLER_CD=6 TASK=Debian-all \
KERNEL_PARAMS='desktop=all' \
MAXCDS=1 MAXISOS=ALL MAXJIGDOS=ALL \
./testingcds "i386 amd64 source"
error=$?
DVDEND=`date -u +%H:%M:%S`
echo "Multi-arch DVD started at $DVDSTART, ended at $DVDEND, error $error"
mv $PUBDIRJIG/multi/jigdo-dvd/debian* $PUBDIRJIG/multi-arch/jigdo-dvd
cat $PUBDIRJIG/multi/jigdo-dvd/MD5SUMS >> $PUBDIRJIG/multi-arch/jigdo-dvd/MD5SUMS
cat $PUBDIRJIG/multi/jigdo-dvd/MD5SUMS$SUMS_EXTENSION >> $PUBDIRJIG/multi-arch/jigdo-dvd/MD5SUMS$SUMS_EXTENSION
mv $PUBDIRJIG/multi/iso-dvd/debian* $PUBDIRJIG/multi-arch/iso-dvd
cat $PUBDIRJIG/multi/iso-dvd/MD5SUMS >> $PUBDIRJIG/multi-arch/iso-dvd/MD5SUMS
cat $PUBDIRJIG/multi/iso-dvd/MD5SUMS$SUMS_EXTENSION >> $PUBDIRJIG/multi-arch/iso-dvd/MD5SUMS$SUMS_EXTENSION
rm -rf $PUBDIRJIG/multi
fi
@ -146,9 +172,12 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
~/build/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ multi-arch &
fi
fi # end of multi
# Reset envvars for next iteration
unset DESKTOP
done
~/build/generate_firmware_images lenny
~/build/generate_firmware_images squeeze
~/build/generate_firmware_images sid
if [ "$NOSNAP"x = ""x ] ; then

2
contrib/settings.sh
View File

@ -1,5 +1,5 @@
export TRACE=/org/cdbuilder.debian.org/src/ftp/debian/project/trace/farbror.acc.umu.se
export ARCH_DI_DIR=/org/cdbuilder.debian.org/src/deb-cd/d-i/people.debian.org
export ARCH_DI_DIR=/org/cdbuilder.debian.org/src/deb-cd/d-i
export HOSTNAME=`hostname -f`
export PUBDIR=/org/cdbuilder.debian.org/dst/deb-cd

17
contrib/testingcds
View File

@ -28,7 +28,6 @@ fi
export ARCH="$1"
NUM_ARCHES=`echo $ARCH | wc -w`
FIRSTARCH=`echo $ARCH | awk '{print $1}'`
if [ ! "$JIGDOFALLBACKURLS" ] ; then
export JIGDOFALLBACKURLS="Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/"
@ -129,7 +128,7 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
if [ "$INSTALLER_CD" = "1" -o "$INSTALLER_CD" = "2" ] ; then
##################################
# NETINST STUFF (ISO ONLY for now)
# NETINST STUFF
##################################
# make the dirs we'll use to publish things
@ -147,10 +146,6 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
rm $OUT/$BASE.jigdo
mv $OUT/$BASE.template $TOPDIR/jigdo-cd/$NETINSTNAME.template
done
cat $OUT/MD5SUMS >> $TOPDIR/iso-cd/MD5SUMS
cat $OUT/MD5SUMS >> $TOPDIR/jigdo-cd/MD5SUMS
cat $OUT/SHA1SUMS >> $TOPDIR/iso-cd/SHA1SUMS
cat $OUT/SHA1SUMS >> $TOPDIR/jigdo-cd/SHA1SUMS
rm -f "$OUT"/*
else
@ -166,17 +161,17 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
done
mkdir -p "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}
cat "$OUT"/MD5SUMS >> "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}/MD5SUMS
cat "$OUT"/SHA1SUMS >> "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}/SHA1SUMS
cat "$OUT"/MD5SUMS$SUMS_EXTENSION >> "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}/MD5SUMS$SUMS_EXTENSION
cat "$OUT"/SHA1SUMS$SUMS_EXTENSION >> "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}/SHA1SUMS$SUMS_EXTENSION
mv "$OUT"/*.template "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}
mv "$OUT"/*.jigdo "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}
mkdir -p "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}
cat "$OUT"/MD5SUMS >> "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}/MD5SUMS
cat "$OUT"/SHA1SUMS >> "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}/SHA1SUMS
cat "$OUT"/MD5SUMS$SUMS_EXTENSION >> "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}/MD5SUMS$SUMS_EXTENSION
cat "$OUT"/SHA1SUMS$SUMS_EXTENSION >> "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}/SHA1SUMS$SUMS_EXTENSION
mv "$OUT"/*.iso "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}
date > "$PUBDIRJIG"/$OUTARCH/"$OUT_TYPE"-trace
date > "$PUBDIRJIG"/$OUTARCH/"$OUT_TYPE"-trace
fi
touch $TDIR/$CODENAME/1.pkgs_extracted # so we don't get errors below

65743
tasks/squeeze/popularity-contest
View File

File diff suppressed because it is too large Load Diff