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

Copy in the updated buster cronjobs to match current state.

This commit is contained in:
Steve McIntyre 2019-06-22 18:14:37 +01:00
parent 890ab6645a
commit 30031aef74
3 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/cronjob.daily
View File

@ -107,15 +107,17 @@ if lockfile -r0 $BUILDLOCK ; then
if [ "$arch" = "multi-arch" ] ; then
if $(arch_has_firmware $arch) ; then
export FORCE_CD_SIZE1=CD700
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_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 \
EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
DI=sid DI_DIST="$DI_DIST" \
DI_DIR="$ARCH_DI_DIR" \
DI_WWW_HOME=default ./testingcds "amd64 i386" &
fi
@ -127,12 +129,14 @@ if lockfile -r0 $BUILDLOCK ; then
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
FORCE_FIRMWARE=1 CDNAME=firmware \
EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "amd64 i386" &
fi
fi
unset FORCE_CD_SIZE1
fi
if [ "$SID_WANTED" = "1" ] ; then
@ -140,9 +144,10 @@ if lockfile -r0 $BUILDLOCK ; then
build_started SIDNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=sid DI_DIST="$DI_DIST" VARIANTS=xen \
DI=sid DI_DIST="$DI_DIST" \
DI_DIR="$ARCH_DI_DIR" \
DI_WWW_HOME=default ./testingcds "amd64 i386" &
fi
@ -153,9 +158,10 @@ if lockfile -r0 $BUILDLOCK ; then
build_started TESTINGNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel LOGAPPEND="-1" \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "amd64 i386" &
fi
fi

29
contrib/cronjob.weekly
View File

@ -209,6 +209,27 @@ if lockfile -r0 $BUILDLOCK ; then
esac
fi
# 16G USB image
if [ "$NOUSB"x = ""x ] ; then
unset DESKTOP
export MAX_PKG_SIZE=999999999999
case $arch in
i386|amd64)
export MAXISOS=0
export MAXJIGDOS=1
export DESKTOP=all
export VARIANTS=xen
build_started USB16G
INSTALLER_CD=M TASK=Debian-all \
KERNEL_PARAMS='desktop=all' \
./testingcds "$arch" &
;;
*)
echo " Not running USB16G build for $arch"
;;
esac
fi
# individual desktop cd #1: xfce only these days
if [ "$arch"x != "source"x ] && [ "$NOCD"x = ""x ] ; then
if [ "$NOXFCECD"x = ""x ] ; then
@ -345,7 +366,8 @@ if lockfile -r0 $BUILDLOCK ; then
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 \
KERNEL_PARAMS="desktop=all" \
DESKTOP=all VARIANTS=xen \
DESKTOP=all \
EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=${DI} DI_DIST=${DI} \
@ -353,15 +375,18 @@ if lockfile -r0 $BUILDLOCK ; then
if $(arch_has_firmware $arch) ; then
build_started NIFIRMWARE
export FORCE_CD_SIZE1=CD700
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
FORCE_FIRMWARE=1 CDNAME=firmware \
KERNEL_PARAMS="desktop=all" \
DESKTOP=all VARIANTS=xen \
DESKTOP=all \
EXCLUDE_686_PAE_KERNEL=1 \
TASK=debian-installer+kernel \
MAXISOS=ALL MAXJIGDOS=ALL \
DI=${DI} DI_DIST=${DI} \
./testingcds "amd64 i386" &
unset FORCE_CD_SIZE1
fi
fi

1
debian/changelog vendored
View File

@ -24,6 +24,7 @@ debian-cd (3.1.24) UNRELEASED; urgency=medium
* Don't include -686-pae udebs on media - we may not have a kernel
to use with them anyway
* Add support for USB sticks any integer multiple of 1GB in size.
* Copy in the updated buster cronjobs to match current state.
-- Holger Levsen <holger@debian.org> Wed, 20 Feb 2019 14:12:16 +0100