Latest versions of files in use for official Debian builds
This commit is contained in:
parent
03f349fcb1
commit
8b382c3f4f
|
@ -151,6 +151,18 @@ export MKISOFS_OPTS="-jigdo-template-compress bzip2 -r " #-checksum_algorithm_is
|
|||
# export MKISOFS_OPTS="-r" #For normal users
|
||||
# export MKISOFS_OPTS="-r -F ." #For symlink farmers
|
||||
|
||||
# Override for i386,amd64,multi to use xorriso.
|
||||
# BE AWARE: for multi-arch the order of the arches here will have to
|
||||
# match the order they're declared in the build
|
||||
export i386_MKISOFS="/home/93sam/xorriso"
|
||||
export i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
|
||||
export amd64_MKISOFS="/home/93sam/xorriso"
|
||||
export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
|
||||
export amd64_i386_MKISOFS="/home/93sam/xorriso"
|
||||
export amd64_i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
|
||||
export i386_amd64_source_MKISOFS="/home/93sam/xorriso"
|
||||
export i386_amd64_source_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
|
||||
|
||||
# ISOLinux support for multiboot on CD1 for i386
|
||||
export ISOLINUX=1
|
||||
|
||||
|
@ -166,12 +178,6 @@ export VERBOSE_MAKE=1
|
|||
# the proper official CD run does not work
|
||||
#ATTEMPT_FALLBACK=yes
|
||||
|
||||
# Set your disk size here in MB. Used in calculating package and
|
||||
# source file layouts in build.sh and build_all.sh. Defaults are for
|
||||
# CD-R, try ~4600 for DVD-R.
|
||||
if [ ! "$DEFBINSIZE" ] ; then export DEFBINSIZE=642 ; fi
|
||||
if [ ! "$DEFSRCSIZE" ] ; then export DEFSRCSIZE=642 ; fi
|
||||
|
||||
if [ "$DISKTYPE"x = ""x ] ; then
|
||||
DISKTYPE=CD
|
||||
fi
|
||||
|
@ -248,7 +254,7 @@ export JIGDO_EXCLUDE="'README*' /doc/ /md5sum.txt /.disk/ /pics/ 'Release*' 'Pac
|
|||
|
||||
# Specify the minimum file size to consider for jigdo processing. Any files
|
||||
# smaller than this will simply be placed straight into the template file.
|
||||
export JIGDO_OPTS="-jigdo-min-file-size 0"
|
||||
export JIGDO_OPTS="-jigdo-min-file-size 1024"
|
||||
|
||||
for EXCL in $JIGDO_EXCLUDE
|
||||
do
|
||||
|
|
|
@ -9,6 +9,8 @@ export DATE_BUILD="$DATE-$BUILDNUM"
|
|||
export TESTING_SUITE=squeeze
|
||||
BUILDS_RUNNING=""
|
||||
|
||||
export SID_WANTED=1
|
||||
|
||||
. $TOPDIR/common.sh
|
||||
|
||||
# If we're doing a normal set of daily/weekly builds, leave the
|
||||
|
@ -91,25 +93,34 @@ if lockfile -r0 .debian-cd.lock ; then
|
|||
|
||||
echo "Building $arch:"
|
||||
for ARCHDIR in \
|
||||
${PUBDIRJIG}/sid_d-i/${DATE_BUILD}/${arch} \
|
||||
${PUBDIRJIG}/${TESTING_SUITE}_d-i/${DATE_BUILD}/${arch} \
|
||||
${PUBDIRJIG}-firmware/sid_d-i/${DATE_BUILD}/${arch} \
|
||||
${PUBDIRJIG}-firmware/${TESTING_SUITE}_d-i/${DATE_BUILD}/${arch} \
|
||||
; do
|
||||
mkdir -p ${ARCHDIR}/iso-cd ${ARCHDIR}/jigdo-cd
|
||||
done
|
||||
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
for ARCHDIR in \
|
||||
${PUBDIRJIG}/sid_d-i/${DATE_BUILD}/${arch} \
|
||||
${PUBDIRJIG}-firmware/sid_d-i/${DATE_BUILD}/${arch} \
|
||||
; do
|
||||
mkdir -p ${ARCHDIR}/iso-cd ${ARCHDIR}/jigdo-cd
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "$arch" = "multi-arch" ] ; then
|
||||
for arch1 in $ARCHES_FIRMWARE; do
|
||||
if [ "$arch" = "$arch1" ] ; then
|
||||
build_started SIDNIFIRMWARE
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
|
||||
FORCE_FIRMWARE=1 CDNAME=firmware \
|
||||
TASK=debian-installer+kernel LOGAPPEND="-1" \
|
||||
MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
|
||||
DI_WWW_HOME=default ./testingcds "amd64 i386 powerpc" &
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
build_started SIDNIFIRMWARE
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
|
||||
FORCE_FIRMWARE=1 CDNAME=firmware \
|
||||
TASK=debian-installer+kernel LOGAPPEND="-1" \
|
||||
MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
|
||||
DI_WWW_HOME=default ./testingcds "amd64 i386" &
|
||||
fi
|
||||
|
||||
build_started TESTINGNIFIRMWARE
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
|
@ -118,17 +129,19 @@ if lockfile -r0 .debian-cd.lock ; then
|
|||
TASK=debian-installer+kernel LOGAPPEND="-1" \
|
||||
MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
|
||||
./testingcds "amd64 i386 powerpc" &
|
||||
./testingcds "amd64 i386" &
|
||||
fi
|
||||
done
|
||||
|
||||
build_started SIDNI
|
||||
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" VARIANTS=xen \
|
||||
DI_WWW_HOME=default ./testingcds "amd64 i386 powerpc" &
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
build_started SIDNI
|
||||
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" VARIANTS=xen \
|
||||
DI_WWW_HOME=default ./testingcds "amd64 i386" &
|
||||
fi
|
||||
|
||||
build_started TESTINGNI
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
|
@ -136,28 +149,32 @@ if lockfile -r0 .debian-cd.lock ; then
|
|||
TASK=debian-installer+kernel LOGAPPEND="-1" \
|
||||
MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
|
||||
./testingcds "amd64 i386 powerpc" &
|
||||
./testingcds "amd64 i386" &
|
||||
|
||||
catch_parallel_builds
|
||||
rm -rf $PUBDIRJIG/$arch
|
||||
if [ "$arch_error"x = "none"x ] ; then
|
||||
finalise_arch_dir $arch sid free
|
||||
finalise_arch_dir $arch ${TESTING_SUITE} free
|
||||
finalise_arch_dir $arch sid firmware
|
||||
finalise_arch_dir $arch ${TESTING_SUITE} firmware
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
finalise_arch_dir $arch sid free
|
||||
finalise_arch_dir $arch sid firmware
|
||||
fi
|
||||
fi
|
||||
|
||||
else # end of m-a
|
||||
|
||||
for arch1 in $ARCHES_FIRMWARE; do
|
||||
if [ "$arch" = "$arch1" ] ; then
|
||||
build_started SIDNIFIRMWARE
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
FORCE_FIRMWARE=1 CDNAME=firmware \
|
||||
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
|
||||
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" \
|
||||
./testingcds "$arch" &
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
build_started SIDNIFIRMWARE
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
FORCE_FIRMWARE=1 CDNAME=firmware \
|
||||
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
|
||||
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" \
|
||||
./testingcds "$arch" &
|
||||
fi
|
||||
|
||||
build_started TESTINGNIFIRMWARE
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
|
@ -169,19 +186,21 @@ if lockfile -r0 .debian-cd.lock ; then
|
|||
fi
|
||||
done
|
||||
|
||||
build_started SIDBC
|
||||
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" &
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
build_started SIDBC
|
||||
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" &
|
||||
|
||||
build_started SIDNI
|
||||
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" &
|
||||
build_started SIDNI
|
||||
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" &
|
||||
fi
|
||||
|
||||
build_started TESTINGBC
|
||||
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
|
||||
|
@ -200,10 +219,12 @@ if lockfile -r0 .debian-cd.lock ; then
|
|||
catch_parallel_builds
|
||||
rm -rf $PUBDIRJIG/$arch
|
||||
if [ "$arch_error"x = "none"x ] ; then
|
||||
finalise_arch_dir $arch sid free
|
||||
finalise_arch_dir $arch ${TESTING_SUITE} free
|
||||
finalise_arch_dir $arch sid firmware
|
||||
finalise_arch_dir $arch ${TESTING_SUITE} firmware
|
||||
if [ "$SID_WANTED" = "1" ] ; then
|
||||
finalise_arch_dir $arch sid free
|
||||
finalise_arch_dir $arch sid firmware
|
||||
fi
|
||||
fi
|
||||
|
||||
fi # end of normal arch build
|
||||
|
|
|
@ -63,7 +63,7 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
|
|||
#export DI_DIR="$ARCH_DI_DIR"
|
||||
|
||||
# Full CD set
|
||||
if [ "$NOCD"x = ""x ] ; then
|
||||
if [ "$NOCD"x = ""x ] && [ "$NOFULLCD"x = ""x ] ; then
|
||||
export MAX_PKG_SIZE=500000000
|
||||
case $arch in
|
||||
i386|amd64|source)
|
||||
|
@ -115,23 +115,27 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
|
|||
|
||||
# kde and xfce/lxde cds
|
||||
if [ "$arch"x != "source"x ] && [ "$NOCD"x = ""x ] ; then
|
||||
export MAX_PKG_SIZE=300000000
|
||||
export DESKTOP=kde
|
||||
export MAXISOS=1; export MAXJIGDOS=1
|
||||
build_started KDECD
|
||||
if [ "$NOKDECD"x = ""x ] ; then
|
||||
export MAX_PKG_SIZE=300000000
|
||||
export DESKTOP=kde
|
||||
export MAXISOS=1; export MAXJIGDOS=1
|
||||
build_started KDECD
|
||||
INSTALLER_CD=4 TASK=Debian-kde \
|
||||
KERNEL_PARAMS='desktop=kde' \
|
||||
MAXCDS=1 MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
./testingcds "$arch" &
|
||||
fi
|
||||
|
||||
export MAX_PKG_SIZE=300000000
|
||||
export DESKTOP=light
|
||||
export MAXISOS=1; export MAXJIGDOS=1
|
||||
build_started LIGHTCD
|
||||
INSTALLER_CD=B TASK=Debian-light \
|
||||
KERNEL_PARAMS='desktop=light' \
|
||||
MAXCDS=1 MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
./testingcds "$arch" &
|
||||
if [ "$NOLIGHTCD"x = ""x ] ; then
|
||||
export MAX_PKG_SIZE=300000000
|
||||
export DESKTOP=light
|
||||
export MAXISOS=1; export MAXJIGDOS=1
|
||||
build_started LIGHTCD
|
||||
INSTALLER_CD=B TASK=Debian-light \
|
||||
KERNEL_PARAMS='desktop=light' \
|
||||
MAXCDS=1 MAXISOS=ALL MAXJIGDOS=ALL \
|
||||
./testingcds "$arch" &
|
||||
fi
|
||||
fi
|
||||
|
||||
catch_parallel_builds
|
||||
|
@ -192,8 +196,10 @@ if lockfile -r0 $TOPDIR/.debian-cd.lock ; then
|
|||
unset DESKTOP
|
||||
done
|
||||
|
||||
~/build/generate_firmware_images squeeze
|
||||
~/build/generate_firmware_images sid
|
||||
if [ "$NOFW"x = ""x ] ; then
|
||||
~/build/generate_firmware_images squeeze
|
||||
~/build/generate_firmware_images sid
|
||||
fi
|
||||
|
||||
if [ "$NOSNAP"x = ""x ] ; then
|
||||
~/bin/weekly-snapshots
|
||||
|
|
|
@ -80,7 +80,9 @@ copy_files() {
|
|||
copy_files $PUBDIRJIG $RSYNC_TARGET $ARCH
|
||||
|
||||
echo "$START: Starting $ARCH sync from $PUBDIRJIG to $RSYNC_TARGET" >> $LOG
|
||||
mv $RSYNC_TARGET/$ARCH $RSYNC_TARGET/$ARCH.old
|
||||
if [ -e $RSYNC_TARGET/$ARCH ] ; then
|
||||
mv -f $RSYNC_TARGET/$ARCH $RSYNC_TARGET/$ARCH.old
|
||||
fi
|
||||
mv $RSYNC_TARGET/$ARCH.tmp $RSYNC_TARGET/$ARCH
|
||||
rm -rf $RSYNC_TARGET/$ARCH.old &
|
||||
|
||||
|
|
|
@ -244,7 +244,7 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
|
|||
|
||||
for i in $MYEMAIL
|
||||
do
|
||||
grep "extents written" "$LOGFILE"|mail -s "testingcds $RUN went ok" "$i"
|
||||
grep -e "extents written" -e "Written to media" "$LOGFILE"|mail -s "testingcds $RUN went ok" "$i"
|
||||
done
|
||||
overview "$RUN" success
|
||||
|
||||
|
|
Loading…
Reference in New Issue