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

Update files in contrib to match what's in daily use 

Copied files across from the setup repo
This commit is contained in:
Steve McIntyre 2015-04-20 12:41:47 +01:00
parent 1fcc22f3ac
commit 15fe89ea9a
15 changed files with 630 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/CONF.sh
View File

@ -47,8 +47,8 @@ unset BASE_EXCLUDE || true
# Where I am (hoping I'm in the debian-cd dir)
export BASEDIR=`pwd`
# Building wheezy cd set ...
export CODENAME=wheezy
# Building jessie cd set ...
export CODENAME=jessie
if [ ! "$DI_CODENAME" ]
then

184
contrib/HEADER.html.in Normal file
View File

@ -0,0 +1,184 @@
#if 0
Input file for docs in multiple different directories. Process with
cpp.
#endif
<h1>What's in this directory?</h1>
#ifdef STYLElist
<p>These are list files.</p>
<h2>How do I use these files?</h2>
<p>
The list files here simply describe what files are contained in
each Debian ISO image, in order to help users find which images
they might want to download. They are simply text files, compressed
to save space and download time.</p>
#else
# ifdef ARCHsource
<p>These are files containing source code for the Debian
operating system.</p>
# else
<p>These are files containing the installer and other software
for the Debian GNU/KERNEL operating system.
# ifdef ARCHmulti
The files in this directory are designed to work on both 32-bit
and 64-bit PCs (i386 and amd64).
# else
The files in this directory are specifically for
the <code>ARCH</code> architecture.</p>
# endif
# endif
<h2>How do I use these files?</h2>
# ifdef STYLEjigdo
<p>The files here are in "jigdo"
format. Use <a href="https://www.debian.org/CD/jigdo-cd/">jigdo</a>
tools to download the contents of the complete ISO image files
from what's here and a normal Debian mirror. You should end up
with an exact copy of each ISO image as though you'd downloaded
it directly via HTTP or FTP.</p>
# elif defined(STYLEbt)
<p>The files here are bittorrent files. Use
a <a href="https://www.debian.org/CD/torrent-cd/">bittorrent</a>
client program to download the contents of the complete ISO image
files in a peer-to-peer manner. You should end up with an exact
copy of each ISO image as though you'd downloaded it directly via
HTTP or FTP.</p>
# elif defined(STYLEiso)
<p>The files here are complete ISO images, ready to use.</p>
# endif
<p> Once you have downloaded all the ISO images you want, you will
typically need to write them to installation media.</p>
<h2>What size and type of media will I need?</h2>
<p>The images described here are sized to be written to
# ifdef TYPEcd
writeable CD media
# elif TYPEdvd
writeable DVD media
# elif TYPEbd
writeable Blu-Ray media
# elif TYPEdlbd
writeable dual-layer Blu-Ray media
# endif
at a minimum, but may be written to larger media if needed.
# ifdef ISOHYBRID
For <strong>extra</strong> convenience, these images may also be
written directly to a USB stick. So long as your computer will
boot directly from that USB stick, it should start the Debian
installer that way.
# if defined(TYPEdvd)
The first DVD in this set is also deliberately limited in size
so it should fit on a standard-sized 4GB USB stick.
# endif
# endif
</p>
# if !defined(ONEonly) && !defined(ARCHsource)
<h2>There are lots of files here! Do I need all of them?</h2>
<p>In most cases it is not necessary to download and
use <strong>all</strong> of these images to be able to install
Debian on your computer. Debian comes with a massive set of
software packages, hence why it takes so many disks for a
complete set. Most typical users only need a small subset of
those software packages.</p>
<p>Initially, you will only need to download and use
the <strong>first</strong> image of a set (labelled as
<code>debian-<i>something</i>-1</code> to be able to start the
Debian installer and set up Debian on your computer. If there are
more images available here
(labelled <code>debian-<i>something</i>-2</code>,
<code>debian-<i>something</i>-3</code>, etc.), they contain the
extra packages that can be installed on a Debian system (as
mentioned previously). They will <strong>not</strong> be bootable
and are entirely optional. If you have a fast Internet
connection, you're most likely better off installing any desired
extra packages directly from the Debian mirrors on the Internet
instead of by using these extra images.</p>
# endif
# if defined(TYPEcd) && !defined(ARCHsource) && !defined(STYLElist)
# if !defined(ONEonly)
<p>There are different versions of CD #1 here to allow for a
choice of default desktop on installation,
e.g. <code>debian-<i>something</i>-kde-CD-1</code> contains the
core pieces of the KDE desktop and will default to installing
that desktop when used. The <strong>default</strong> desktop
installed using
<code>debian-<i>something</i>-CD-1</code> is Gnome.</p>
# endif
<p>The <code>netinst</code> CD here is a small CD image that
contains just the core Debian installer code and a small core set
of text-mode programs (known as "standard" in Debian). To install
a desktop or other common software, you'll also need either an
Internet connection or some other Debian CD/DVD images.</p>
# endif
# ifdef UPDATES
<p>The <code>update</code> files here are extra convenience files
for people updating from previous versions of Debian. If you are
installing fresh, you may safely ignore
them. <a href="https://www.debian.org/CD/faq/#update-cd">More
details...</a></p>
# endif
<h2>How can I verify my download is correct and exactly what has
been created by Debian?</h2>
<p>There are files here (MD5SUMS, SHA1SUMS, etc.) which contain
checksums of the images. These checksum files are also signed - see
MD5SUMS.sign, SHA1SUMS.sign, etc. Once you've downloaded an image,
you can check:</p>
<ul>
<li>that its checksum matches that expected from the checksum file; and
<li>that the checksum file has not been tampered with.
</ul>
<p>For more information about how to do these steps, read
the <a href="https://www.debian.org/CD/verify">verification guide</a>.
#endif
<h2>Other questions?</h2>
<p>See the Debian CD <a href="https://www.debian.org/CD/faq/">FAQ</a>
for lots more information about Debian CDs and installation.</p>

44
contrib/common.sh
View File

@ -22,6 +22,8 @@ build_description () {
case $1 in
NI)
DESC="Netinst CD";;
MACNI)
DESC="Mac Netinst CD";;
CD)
DESC="Full CD";;
DVD)
@ -30,8 +32,10 @@ build_description () {
DESC="Blu-ray";;
DLBD)
DESC="Dual-layer Blu-ray";;
KDE)
KDECD)
DESC="KDE CD";;
GNOMECD)
DESC="GNOME CD";;
LIGHTCD)
DESC="XFCE/lxde CD";;
XFCECD)
@ -105,5 +109,41 @@ catch_parallel_builds () {
fi
arch_end=`now`
arch_time=`calc_time $arch_start $arch_end`
echo "$ARCH build started at $arch_start, ended at $arch_end (took $arch_time), error(s) $arch_error"
echo "$arch build started at $arch_start, ended at $arch_end (took $arch_time), error(s) $arch_error"
}
generate_checksums_for_arch () {
ARCH=$1
JIGDO_DIR=$2
ISO_DIR=$(echo $JIGDO_DIR | sed 's,jigdo-,iso-,g')
echo "$ARCH: Generating checksum files for the builds in $JIGDO_DIR"
$TOPDIR/debian-cd/tools/imagesums $JIGDO_DIR $EXTENSION > /dev/null
cp $JIGDO_DIR/*SUMS*${EXTENSION} $ISO_DIR
}
catch_live_builds () {
# Catch parallel build types here
while [ ! -f $PUBDIRLIVETRACE ] || [ ! -f $PUBDIROSTRACE ] ; do
sleep 1
done
. $PUBDIROSTRACE
time_spent=`calc_time $start $end`
echo "openstack build started at $start, ended at $end (took $time_spent), error $error"
. $PUBDIRLIVETRACE
time_spent=`calc_time $start $end`
echo "live builds started at $start, ended at $end (took $time_spent), error $error"
}
arch_has_firmware () {
arch=$1
for arch1 in $ARCHES_FIRMWARE; do
if [ "$arch" = "$arch1" ] ; then
return 0
fi
done
return 1
}

97
contrib/cronjob.daily
View File

@ -11,9 +11,12 @@ export TOPDIR
BUILDLOCK=$HOME/.debian-cd.lock
export PUBDIRJIG=$PUBDIR/daily-builds
export DATE_BUILD="$DATE-$BUILDNUM"
export TESTING_SUITE=wheezy
export TESTING_SUITE=jessie
BUILDS_RUNNING=""
export NI_WANTED=1
export TESTING_WANTED=0
if [ "$RELEASE_BUILD"x = ""x ] ; then
export SID_WANTED=1
export OUT_FREE_TST=${PUBDIRJIG}/${TESTING_SUITE}_d-i/${DATE_BUILD}
@ -24,30 +27,23 @@ if [ "$RELEASE_BUILD"x = ""x ] ; then
export RSYNC_TARGET_FIRMWARE=/mnt/nfs-cdimage/unofficial/non-free/cd-including-firmware/daily-builds
else
export SID_WANTED=0
export TESTING_WANTED=1
export OUT_FREE_TST=${PUBDIRJIG}-$RELEASE_BUILD
export OUT_FW_TST=${PUBDIRJIG}-$RELEASE_BUILD-firmware
export OUT_FREE_SID=""
export OUT_FW_SID=""
export RSYNC_TARGET_FREE=/mnt/nfs-cdimage/.${RELEASE_BUILD}
export RSYNC_TARGET_FIRMWARE=/mnt/nfs-cdimage/unofficial/non-free/cd-including-firmware/.${RELEASE_BUILD}
export CONF=~/build.wheezy/CONF.sh.${RELEASE_BUILD}
export CONF=~/build.jessie/CONF.sh.${RELEASE_BUILD}
export RELEASE_BUILD=$RELEASE_BUILD
export EXTENSION=".small"
fi
export BC_WANTED=0
export NI_WANTED=1
. $TOPDIR/common.sh
# Make sure the machine isn't rebooted while we're busy
reboot_lock
# 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
@ -72,15 +68,20 @@ finalise_arch_dir () {
sed "s/ARCH/$ARCH/g;s/DATE/$DATESTRING/g;s/BUILDNUM/$BUILDNUM/g;s/INST_VER/$INST_VER/g" \
$INFILE > $ARCH_DIR/HEADER.html
fi
$TOPDIR/debian-cd/tools/imagesums $ARCH_JIGDO_DIR $SUMS_EXTENSION
cp $ARCH_JIGDO_DIR/*SUMS* $ARCH_ISO_DIR
generate_checksums_for_arch $ARCH $ARCH_JIGDO_DIR
cd $ARCH_DIR
# Only make torrent files for release builds
if [ "$RELEASE_BUILD"x != ""x ] ; then
~/build.wheezy/mktorrent iso-cd/*iso
~/build.jessie/mktorrent iso-cd/*iso
cp iso-cd/*SUMS* bt-cd
fi
~/build.wheezy/mklist iso-cd/*iso
if [ "$RELEASE_BUILD"x = ""x ] ; then
echo "Signing checksums files using the automatic key"
~/build.jessie/sign-images $OUT_DIR $ARCH
fi
~/build.jessie/mklist iso-cd/*iso
cd $TOPDIR
fi
done
@ -89,8 +90,9 @@ finalise_arch_dir () {
cd $TOPDIR &&
if lockfile -r0 $BUILDLOCK ; then
echo "svn update debian-cd:"
cd debian-cd && svn cleanup ; svn up ; cd ..
# echo "NOT checking for git updates"
echo "git update debian-cd"
cd debian-cd && git pull ; cd ..
cd $TOPDIR
@ -116,8 +118,7 @@ if lockfile -r0 $BUILDLOCK ; then
done
if [ "$arch" = "multi-arch" ] ; then
for arch1 in $ARCHES_FIRMWARE; do
if [ "$arch" = "$arch1" ] ; then
if $(arch_has_firmware $arch) ; then
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started SIDNIFIRMWARE
@ -131,6 +132,7 @@ if lockfile -r0 $BUILDLOCK ; then
fi
fi
if [ "$TESTING_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started TESTINGNIFIRMWARE
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
@ -142,7 +144,7 @@ if lockfile -r0 $BUILDLOCK ; then
./testingcds "amd64 i386" &
fi
fi
done
fi
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
@ -156,6 +158,7 @@ if lockfile -r0 $BUILDLOCK ; then
fi
fi
if [ "$TESTING_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started TESTINGNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
@ -165,6 +168,7 @@ if lockfile -r0 $BUILDLOCK ; then
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" VARIANTS=xen \
./testingcds "amd64 i386" &
fi
fi
catch_parallel_builds
rm -rf $PUBDIRJIG/$arch
@ -174,8 +178,7 @@ if lockfile -r0 $BUILDLOCK ; then
else # end of m-a
for arch1 in $ARCHES_FIRMWARE; do
if [ "$arch" = "$arch1" ] ; then
if $(arch_has_firmware $arch) ; then
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started SIDNIFIRMWARE
@ -188,6 +191,7 @@ if lockfile -r0 $BUILDLOCK ; then
fi
fi
if [ "$TESTING_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started TESTINGNIFIRMWARE
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
@ -198,18 +202,9 @@ if lockfile -r0 $BUILDLOCK ; then
./testingcds "$arch" &
fi
fi
done
if [ "$SID_WANTED" = "1" ] ; then
if [ "$BC_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" &
fi
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started SIDNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
@ -220,15 +215,7 @@ if lockfile -r0 $BUILDLOCK ; then
fi
fi
if [ "$BC_WANTED" = "1" ] ; then
build_started TESTINGBC
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 \
TASK=debian-installer MAXISOS=ALL MAXJIGDOS=ALL \
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "$arch" &
fi
if [ "$TESTING_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started TESTINGNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
@ -237,6 +224,34 @@ if lockfile -r0 $BUILDLOCK ; then
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "$arch" &
fi
fi
# Special Mac-only builds
if [ "$arch" = "i386" ] ; then
if [ "$SID_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started SIDMACNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=F \
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
BOOT_METHODS=BIOS CDNAME="debian-mac" \
DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" \
./testingcds "$arch" &
fi
fi
if [ "$TESTING_WANTED" = "1" ] ; then
if [ "$NI_WANTED" = "1" ] ; then
build_started TESTINGMACNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=F \
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
BOOT_METHODS=BIOS CDNAME="debian-mac" \
DI=${TESTING_SUITE} DI_DIST="$DI_DIST" \
./testingcds "$arch" &
fi
fi
fi
catch_parallel_builds
rm -rf $PUBDIRJIG/$arch

151
contrib/cronjob.weekly
View File

@ -9,8 +9,11 @@ export TOPDIR
. $TOPDIR/settings.sh
export PUBDIRJIG=$PUBDIR/weekly-builds
export PUBDIROSTRACE=/mnt/nfs-cdimage/.live/trace-os
export PUBDIRLIVETRACE=/mnt/nfs-cdimage/.live/trace-live
export DATE_BUILD="$DATE-$BUILDNUM"
BUILDLOCK=$HOME/.debian-cd.lock
CD_I_F="/mnt/nfs-cdimage/unofficial/non-free/cd-including-firmware"
. $TOPDIR/common.sh
@ -23,16 +26,16 @@ USE_DAILY_DI=Y
if [ "$RELEASE_BUILD"x = ""x ] ; then
export RSYNC_TARGET=/mnt/nfs-cdimage/weekly-builds
export RSYNC_TARGET_FIRMWARE=/mnt/nfs-cdimage/unofficial/non-free/cd-including-firmware/weekly-builds
export RSYNC_TARGET_FIRMWARE=${CD_I_F}/weekly-builds
else
export RSYNC_TARGET=/mnt/nfs-cdimage/.${RELEASE_BUILD}
export RSYNC_TARGET_FIRMWARE=/mnt/nfs-cdimage/unofficial/non-free/cd-including-firmware/.${RELEASE_BUILD}
export CONF=~/build.wheezy/CONF.sh.${RELEASE_BUILD}
export RSYNC_TARGET=/mnt/nfs-cdimage/.${RELEASE_BUILD}/debian-cd
export RSYNC_TARGET_FIRMWARE=${CD_I_F}/.${RELEASE_BUILD}/debian-cd
export CONF=~/build.jessie/CONF.sh.${RELEASE_BUILD}
export RELEASE_BUILD=$RELEASE_BUILD
# 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.
export SUMS_EXTENSION=".large"
export EXTENSION=".large"
USE_DAILY_DI=N
fi
@ -51,19 +54,32 @@ export DI_CODENAME
BUILDS_RUNNING=""
export NOOPENSTACK
export NOLIVE
rm -f $PUBDIRLIVETRACE $PUBDIROSTRACE
~/build.jessie/cronjob.weekly-live &
if lockfile -r0 $BUILDLOCK ; then
# echo "NOT checking for svn updates"
echo "svn update debian-cd"
cd debian-cd && svn cleanup; svn up ; cd ..
# echo "NOT checking for git updates"
echo "git update debian-cd"
cd debian-cd && git pull ; cd ..
# Work out the default desktop, and do *not* build a CD1 for that
# desktop - it'll be done in the full set anyway
TASKSEL_DEB=$(./debian-cd/tools/which_deb ${MIRROR} testing task-desktop binary)
DEFAULT_DESKTOP=$(dpkg --info ${MIRROR}/${TASKSEL_DEB} |
awk '/Recommends: task-.*-desktop/ {split($2,a,"-"); print toupper(a[2])}')
echo default desktop is $DEFAULT_DESKTOP, drop CD1 for that desktop
export NO${DEFAULT_DESKTOP}CD=1
# echo "NOT checking for popcon updates"
if [ "$NOPOPCON"x = ""x ] ; then
cd debian-cd && ./tools/update_popcon tasks/wheezy/popularity-contest ; cd ..
cd debian-cd && ./tools/update_popcon tasks/jessie/popularity-contest ; cd ..
fi
cd $TOPDIR
mkdir -p $PUBDIRJIG/trace
mkdir -p $RSYNC_TARGET
mkdir -p $RSYNC_TARGET $RSYNC_TARGET_FIRMWARE
for arch in $ARCHES; do
# Reset envvars for next iteration
@ -71,8 +87,11 @@ if lockfile -r0 $BUILDLOCK ; then
arch_start=`now`
if [ "$arch" != multi-arch ] ; then
rm -rf $PUBDIRJIG/$arch
rm -rf $PUBDIRJIG/$arch $PUBDIRJIG-firmware/$arch
mkdir -p $PUBDIRJIG/$arch
if $(arch_has_firmware $arch) ; then
mkdir -p $PUBDIRJIG-firmware/$arch
fi
# export DI_DIR="$ARCH_DI_DIR"
export VARIANTS=""
@ -109,9 +128,9 @@ if lockfile -r0 $BUILDLOCK ; then
;;
source)
export MAXISOS=ALL; export MAXJIGDOS=ALL ;;
powerpc)
# Special case: make DVD1 fit on a 4GB USB
# stick (#686471)
powerpc|arm64)
# Special cases: make DVD1 fit on a 4GB USB
# stick
export FORCE_CD_SIZE1=STICK4GB
export MAXISOS=1; export MAXJIGDOS=ALL ;;
*)
@ -168,8 +187,21 @@ if lockfile -r0 $BUILDLOCK ; then
esac
fi
# kde, xfce and lxde cds
# individual desktop cds: gnome, kde, xfce. lxde
if [ "$arch"x != "source"x ] && [ "$NOCD"x = ""x ] ; then
if [ "$NOGNOMECD"x = ""x ] ; then
export MAX_PKG_SIZE=300000000
export DESKTOP=gnome
export MAXISOS=1; export MAXJIGDOS=1
unset FORCE_CD_SIZE1
export VARIANTS=""
build_started GNOMECD
INSTALLER_CD=E TASK=Debian-gnome \
KERNEL_PARAMS='desktop=gnome' \
MAXCDS=1 MAXISOS=ALL MAXJIGDOS=ALL \
./testingcds "$arch" &
fi
if [ "$NOKDECD"x = ""x ] ; then
export MAX_PKG_SIZE=300000000
export DESKTOP=kde
@ -231,8 +263,7 @@ if lockfile -r0 $BUILDLOCK ; then
DI=${DI} DI_DIST=${DI} \
./testingcds "$arch" &
for arch1 in $ARCHES_FIRMWARE; do
if [ "$arch" = "$arch1" ] ; then
if $(arch_has_firmware $arch) ; then
build_started NIFIRMWARE
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
@ -243,27 +274,58 @@ if lockfile -r0 $BUILDLOCK ; then
DI=${DI} DI_DIST=${DI} \
./testingcds "$arch" &
fi
done
if [ "$arch" = "i386" ] ; then
build_started MACNI
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=F \
BOOT_METHODS=BIOS CDNAME="debian-mac" \
KERNEL_PARAMS="desktop=all" \
DESKTOP=all VARIANTS=xen \
TASK=debian-installer+kernel MAXISOS=ALL MAXJIGDOS=ALL \
DI=${DI} DI_DIST=${DI} \
./testingcds "$arch" &
fi
fi
catch_parallel_builds
for dir in $PUBDIRJIG/$arch/jigdo-*; do
generate_checksums_for_arch $arch $dir
done
if [ -d $PUBDIRJIG-firmware/$arch ] ; then
for dir in ${PUBDIRJIG}-firmware/$arch/jigdo-*; do
generate_checksums_for_arch $arch $dir
done
fi
if [ "$NOSYNC"x = ""x ] ; then
if [ "$arch_error"x = "none"x ] ; then
echo " Running ~/build.wheezy/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ $arch &"
~/build.wheezy/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ $arch &
if [ "$RELEASE_BUILD"x = ""x ] ; then
echo "Signing checksums files using the automatic key"
~/build.jessie/sign-images $PUBDIRJIG $arch
fi
echo " Running ~/build.jessie/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ $arch &"
~/build.jessie/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ $arch &
if [ -d $PUBDIRJIG-firmware/$arch ] ; then
echo " Running ~/build.wheezy/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ $arch &"
~/build.wheezy/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ $arch &
if [ "$RELEASE_BUILD"x = ""x ] ; then
echo "Signing checksums files using the automatic key"
~/build.jessie/sign-images $PUBDIRJIG-firmware $ARCH
fi
echo " Running ~/build.jessie/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ $arch &"
~/build.jessie/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ $arch &
fi
else
~/build.wheezy/report_build_error $RSYNC_TARGET $arch "$arch_error"
~/build.jessie/report_build_error $RSYNC_TARGET $arch "$arch_error"
fi
fi
else # multi-arch
rm -rf $PUBDIRJIG/multi-arch
rm -rf $PUBDIRJIG/multi-arch $PUBDIRJIG-firmware/multi-arch
for i in iso-dvd jigdo-dvd iso-cd jigdo-cd; do
mkdir -p $PUBDIRJIG/multi-arch/$i
if $(arch_has_firmware multi-arch) ; then
mkdir -p $PUBDIRJIG-firmware/multi-arch/$i
fi
done
if [ "$NODVD"x = ""x ] ; then
@ -294,8 +356,7 @@ if lockfile -r0 $BUILDLOCK ; then
DI=${DI} DI_DIST=${DI} \
./testingcds "amd64 i386" &
for arch1 in $ARCHES_FIRMWARE; do
if [ "$arch" = "$arch1" ] ; then
if $(arch_has_firmware $arch) ; then
build_started NIFIRMWARE
OMIT_RELEASE_NOTES=1 OMIT_MANUAL=1 NORECOMMENDS=1 \
NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=C \
@ -307,36 +368,58 @@ if lockfile -r0 $BUILDLOCK ; then
DI=${DI} DI_DIST=${DI} \
./testingcds "amd64 i386" &
fi
done
fi
catch_parallel_builds
for dir in $PUBDIRJIG/multi-arch/jigdo-*; do
generate_checksums_for_arch multi-arch $dir
done
if [ -d $PUBDIRJIG-firmware/multi-arch ] ; then
for dir in ${PUBDIRJIG}-firmware/multi-arch/jigdo-*; do
generate_checksums_for_arch multi-arch $dir
done
fi
if [ "$NOSYNC"x = ""x ] ; then
if [ "$arch_error"x = "none"x ] || [ "$arch_error"x = ""x ] ; then
echo " Running ~/build.wheezy/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ multi-arch &"
~/build.wheezy/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ multi-arch &
if [ "$RELEASE_BUILD"x = ""x ] ; then
echo "Signing checksums files using the automatic key"
~/build.jessie/sign-images $PUBDIRJIG multi-arch
fi
echo " Running ~/build.jessie/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ multi-arch &"
~/build.jessie/iso_run $PUBDIRJIG/ $RSYNC_TARGET/ multi-arch &
if [ -d $PUBDIRJIG-firmware/multi-arch ] ; then
echo " Running ~/build.wheezy/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ multi-arch &"
~/build.wheezy/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ multi-arch &
if [ "$RELEASE_BUILD"x = ""x ] ; then
echo "Signing checksums files using the automatic key"
~/build.jessie/sign-images $PUBDIRJIG-firmware multi-arch
fi
echo " Running ~/build.jessie/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ multi-arch &"
~/build.jessie/iso_run ${PUBDIRJIG}-firmware/ $RSYNC_TARGET_FIRMWARE/ multi-arch &
fi
else
~/build.wheezy/report_build_error $RSYNC_TARGET multi-arch "$arch_error"
~/build.jessie/report_build_error $RSYNC_TARGET multi-arch "$arch_error"
fi
fi
fi # end of multi-arch
done
# Generate HEADER.html files
~/build.jessie/generate_headers $RSYNC_TARGET
~/build.jessie/generate_headers $RSYNC_TARGET_FIRMWARE
if [ "$NOFW"x = ""x ] ; then
~/build.wheezy/generate_firmware_images wheezy
~/build.wheezy/generate_firmware_images sid
~/build.jessie/generate_firmware_images jessie
~/build.jessie/generate_firmware_images sid
fi
if [ "$NOSNAP"x = ""x ] ; then
~/bin/weekly-snapshots
fi
catch_live_builds
date -u > $PUBDIRJIG/trace/cdimage.debian.org
rm -f $BUILDLOCK

57
contrib/cronjob.weekly-live Executable file
View File

@ -0,0 +1,57 @@
#!/bin/bash
now () {
date -u +%F:%H:%M:%S
}
START=`now`
ERROR=0
if [ "$NOOPENSTACK"x = ""x ] ; then
echo " Running openstack build"
~/live/bin/run-openstack
ERROR=$?
if [ $ERROR -eq 0 ] ; then
if [ "$RELEASE_BUILD"x = ""x ] ; then
~/build.jessie/sign-images /mnt/nfs-cdimage/.live/new/openstack-jessie ""
mv /mnt/nfs-cdimage/.live/new/openstack-jessie/* /mnt/nfs-cdimage/openstack/testing
else
mkdir -p /mnt/nfs-cdimage/.${RELEASE_BUILD}
mv /mnt/nfs-cdimage/.live/new/openstack-jessie/* /mnt/nfs-cdimage/.${RELEASE_BUILD}/openstack
fi
fi
# Wait for the KVM to shut down cleanly
sleep 30
fi
END=`now`
echo -e "start=$START\nend=$END\nerror=$ERROR\nlogfile=\n" > $PUBDIROSTRACE
START=`now`
ERROR=0
if [ "$NOLIVE"x = ""x ] ; then
echo " Running debian-live build"
~/live/bin/run-live
ERROR=$?
if [ $ERROR -eq 0 ] ; then
if [ "$RELEASE_BUILD"x = ""x ] ; then
~/build.jessie/sign-images /mnt/nfs-cdimage/.live/new/free ""
mv -f /mnt/nfs-cdimage/weekly-live-builds /mnt/nfs-cdimage/weekly-live-builds.old
mv /mnt/nfs-cdimage/.live/new/free/ /mnt/nfs-cdimage/weekly-live-builds
rm -rf /mnt/nfs-cdimage/weekly-live-builds.old
~/build.jessie/sign-images /mnt/nfs-cdimage/.live/new/non-free ""
mv -f ${CD_I_F}/weekly-live-builds ${CD_I_F}/weekly-live-builds.old
mv /mnt/nfs-cdimage/.live/new/non-free ${CD_I_F}/weekly-live-builds
rm -rf ${CD_I_F}/weekly-live-builds.old
else
mkdir -p /mnt/nfs-cdimage/.${RELEASE_BUILD}/
mv /mnt/nfs-cdimage/.live/new/free/ /mnt/nfs-cdimage/.${RELEASE_BUILD}/live-free
mv /mnt/nfs-cdimage/.live/new/non-free /mnt/nfs-cdimage/.${RELEASE_BUILD}/live-non-free
fi
fi
# Wait for the KVM to shut down cleanly
sleep 30
fi
END=`now`
echo -e "start=$START\nend=$END\nerror=$ERROR\nlogfile=\n" > $PUBDIRLIVETRACE
exit 0

2
contrib/daily-firmware.html
View File

@ -1,7 +1,7 @@
<h1>Daily "firmware" build #BUILDNUM for ARCH, using installer build from INST_VER</h1>
<p>These images will install the testing version of Debian, currently
<strong>Wheezy</strong>. They include non-free firmware to make
<strong>Jessie</strong>. They include non-free firmware to make
installation easier on some systems requiring proprietary but
redistributable
firmware. See <a href="http://wiki.debian.org/Firmware">http://wiki.debian.org/Firmware</a>

2
contrib/daily.html
View File

@ -1,7 +1,7 @@
<h1>Daily build #BUILDNUM for ARCH, using installer build from INST_VER</h1>
<p>These images will install the testing version of Debian, currently
<strong>Wheezy</strong>.</p>
<strong>Jessie</strong>.</p>
<p>See the <a href="/cdimage/daily-builds/">top-level daily
directory</a> for more information about the daily builds.</p>

49
contrib/generate_headers Executable file
View File

@ -0,0 +1,49 @@
#!/bin/bash
INPUT=~/build/HEADER.html.in
CPP="cpp -traditional -undef -P -C -nostdinc"
if [ "$1"x = ""x ] ; then
echo "$0: Need to be told which directory to target!"
exit 1
fi
cd $1
for DIR in *; do
if [ -d $DIR ] && [ $DIR != trace ] ; then
ARCH=$DIR
case $ARCH in
i386|amd64|arm64)
EXTRAS="-DISOHYBRID"
;;
multi-arch)
EXTRAS="-DISOHYBRID -DONEonly"
ARCH="multi"
;;
*)
EXTRAS=""
;;
esac
case $ARCH in
kfreebsd*)
KERNEL="kFreeBSD"
;;
hurd*)
KERNEL="Hurd"
;;
*)
KERNEL="Linux"
;;
esac
for DIR1 in $DIR/*-* ; do
STYLE=$(echo $DIR1 | sed 's,^.*/,,g;s,-.*$,,g')
TYPE=$(echo $DIR1 | sed 's,^.*-,,g')
ls -l $DIR1 | grep -q update
if [ $? -eq 0 ] ; then
UPDATES="-DUPDATES"
fi
#echo "Found directory $DIR (ARCH $ARCH, STYLE $STYLE, TYPE $TYPE)"
$CPP -DARCH=${ARCH} -DARCH${ARCH} -DKERNEL=${KERNEL} -DSTYLE${STYLE} -DSTYLE=${STYLE} -DTYPE${TYPE} $UPDATES $EXTRAS $INPUT > $DIR1/HEADER.html
done
fi
done

2
contrib/images4testing_d-i Normal file
View File

@ -0,0 +1,2 @@
DI_DIST=jessie
DI_CODENAME=$DI_DIST

6
contrib/iso_run
View File

@ -6,7 +6,7 @@ PUBDIRJIG=$1
RSYNC_TARGET=$2
ARCH=$3
LOG=~/build.wheezy/log/$ARCH.iso_run
LOG=~/build.jessie/log/$ARCH.iso_run
HOSTNAME=`hostname -f`
LOCK=~/iso_run.lock
START=`date -u +%H:%M:%S`
@ -33,7 +33,7 @@ process_iso() {
cp -a $FILE $OUTDIR/$FILE
if [ "$RELEASE_BUILD"x != ""x ] ; then
~/build.wheezy/mktorrent $FILE >> $LOG
~/build.jessie/mktorrent $FILE >> $LOG
BTFILE=`echo $FILE.torrent | sed 's/iso-/bt-/'`
echo $OUTDIR/$BTFILE >> $LOG
cp -a $BTFILE $OUTDIR/$BTFILE
@ -93,7 +93,7 @@ copy_files() {
# Only populate the HEADER.html file for regular weekly
# builds; we don't want it for releases
DATE=`date -u`
sed "s/ARCH/$ARCH/g;s/DATE/$DATE/g" ~/build.wheezy/weekly.html \
sed "s/ARCH/$ARCH/g;s/DATE/$DATE/g" ~/build.jessie/weekly.html \
> $TARGET/$ARCH.tmp/HEADER.html
fi

6
contrib/settings.sh
View File

@ -5,8 +5,8 @@ export HOSTNAME=`hostname -f`
export PUBDIR=/org/cdbuilder.debian.org/dst/deb-cd
export MIRROR=/org/cdbuilder.debian.org/src/ftp/debian
export BASEDIR=~/build.wheezy/debian-cd
export MKISOFS=~/build.wheezy/mkisofs/usr/bin/mkisofs
export BASEDIR=~/build.jessie/debian-cd
export MKISOFS=~/build.jessie/mkisofs/usr/bin/mkisofs
if [ "$DATE"x = ""x ] ; then
export DATE=`date -u +%Y%m%d`
fi
@ -14,7 +14,7 @@ fi
export EXTRACTED_SOURCES=/mnt/nfs-cdimage/cd-sources
if [ "$ARCHES"x = ""x ] ; then
ARCHES="i386 source amd64 multi-arch powerpc armel armhf ia64 mips mipsel s390x sparc kfreebsd-amd64 kfreebsd-i386"
ARCHES="i386 source amd64 multi-arch arm64 armel armhf ppc64el mips mipsel s390x powerpc"
fi
if [ "$ARCHES_FIRMWARE"x = ""x ] ; then

34
contrib/sign-images Executable file
View File

@ -0,0 +1,34 @@
#!/bin/sh
#
# Helper for signing images
#
DIR=$1
ARCH=$2
KEYID=42468F4009EA8AC3
cd $DIR/$ARCH
for file in $(find . -name '*SUMS' \
-o -name *SUMS.small \
-o -name *SUMS.large); do
gpg -q -a --detach-sign \
--batch --no-tty \
--passphrase-file ~/.testing-pass \
-u $KEYID \
$file 2>&1 > gpg.log
error=$?
if [ $error -ne 0 ] ; then
echo " FAIL:"
cat gpg.log
exit 1
fi
mv $file.asc $file.sign > gpg.log 2>&1
if [ $error -ne 0 ] ; then
echo " FAIL:"
cat gpg.log
exit 1
fi
done
rm -f gpg.log

39
contrib/testingcds
View File

@ -13,11 +13,11 @@
#set -x
if [ "$CONF"x = ""x ] ; then
CONF=~/build.wheezy/CONF.sh
CONF=~/build.jessie/CONF.sh
fi
export CF=$CONF
if [ "$DCD_DIR"x = ""x ] ; then
DCD_DIR=~/build.wheezy/debian-cd
DCD_DIR=~/build.jessie/debian-cd
fi
export CF=$CONF
@ -60,7 +60,7 @@ export LOGFILE="$LOG/$RUN"
case "$INSTALLER_CD" in
1)
export DISKTYPE=BC;;
2|7|8|C)
2|7|8|C|F)
export DISKTYPE=NETINST;;
3|6)
export OUT_TYPE=dvd
@ -79,6 +79,8 @@ case "$INSTALLER_CD" in
D)
export OUT_TYPE=dlbd
export DISKTYPE=DLBD;;
E)
export DISKTYPE=gnome-CD;;
*) export DISKTYPE=CD;;
esac
@ -122,6 +124,10 @@ elif [ "$INSTALLER_CD" = "8" ]; then
export OFFICIAL="Official Multi-Arch Netinst"
elif [ "$INSTALLER_CD" = "C" ]; then
export OFFICIAL="Unofficial Netinst including firmware"
elif [ "$INSTALLER_CD" = "E" ]; then
export OFFICIAL="Official Gnome CD Snapshot"
elif [ "$INSTALLER_CD" = "F" ]; then
export OFFICIAL="Official Mac Netinst"
fi
rm -rf "$OUT"
@ -140,6 +146,15 @@ overview () {
> $LOGFILE
# Make sure we have an extension for all builds, so we don't have
# multiple processes tripping over each other when generating checksum
# files
if [ "$INSTALLER_CD" = ""x ] ; then
SUMS_EXTENSION=".cd"
else
SUMS_EXTENSION=".${INSTALLER_CD}"
fi
# Do the actual building
START=`now`
if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
@ -147,7 +162,8 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
# we treat the daily netinst images in a different way
if [ "$INSTALLER_CD" = "1" ] || \
[ "$INSTALLER_CD" = "2" ] || \
[ "$INSTALLER_CD" = "C" ] ; then
[ "$INSTALLER_CD" = "C" ] || \
[ "$INSTALLER_CD" = "F" ] ; then
##################################
# NETINST STUFF
@ -170,11 +186,6 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
mkdir -p $ARCHDIR/list-cd $ARCHDIR/jigdo-cd $ARCHDIR/iso-cd
# put the isos and jigdos in their place
$TOPDIR/debian-cd/tools/imagesums $OUT $SUMS_EXTENSION >> "$LOGFILE"
sed -i 's/-BC-1/-businesscard/g;s/-NETINST-1/-netinst/g' $OUT/*SUMS*
cp $OUT/*SUMS* $ARCHDIR/iso-cd
cp $OUT/*SUMS* $ARCHDIR/jigdo-cd
for i in "$OUT"/*-1.iso; do
BASE=`basename $i .iso`
NETINSTNAME=`echo $BASE | sed 's/-BC-1/-businesscard/g;s/-NETINST-1/-netinst/g'`
@ -213,18 +224,10 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
done
mkdir -p "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}
for file in "$OUT"/*SUMS${SUMS_EXTENSION}; do
outfile="$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}/`basename $file`
cat $file >> $outfile
done
mv "$OUT"/*.template "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}
mv "$OUT"/*.jigdo "$PUBDIRJIG"/$OUTARCH/jigdo-${OUT_TYPE}
mkdir -p "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}
for file in "$OUT"/*SUMS${SUMS_EXTENSION}; do
outfile="$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}/`basename $file`
cat $file >> $outfile
done
for file in "$OUT"/*.iso; do
if [ -e $file ] ; then
mv $file "$PUBDIRJIG"/$OUTARCH/iso-${OUT_TYPE}
@ -269,7 +272,7 @@ else
for i in $MYEMAIL
do
(echo Error when trying to create cds for $RUN ; cat $LOGFILE) | \
mail -s "testingcds $RUN has failed; log included" "$i"
mail -s "$RELEASE_BUILD testingcds $RUN has failed; log included" "$i"
done
overview "$RUN" failed
END=`now`

1
debian/changelog vendored
View File

@ -16,6 +16,7 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
* Improve autorun.inf, make sure the disc icon displays. Closes: #772691
Thanks to jnqnfe for initial patch, slightly tweaked.
* Add rdnssd on disc 1 by default. Closes: #782299
* Update included files from the setup repo in the contrib dir
[ Ben Hutchings ]
* generate_di+k_list: Update kernel and related package lists for mips*