Merge lp:~seb128/debian-cd/splash-for-canary into lp:debian-cd

[Sebastien Bacher]

[lp:~seb128/debian-cd/splash-for-canary]

2127. By Sebastien Bacher on 2021-10-05

Tweak the kernel parameter order for canary

The splash option needs to be at the end of the line to be copied

Unmerged revisions

2127. By Sebastien Bacher on 2021-10-05

Tweak the kernel parameter order for canary

The splash option needs to be at the end of the line to be copied

2126. By Brian Murray on 2021-09-24

Change Impish to Daily post Beta

2125. By Brian Murray on 2021-09-20

set OFFICIAL for Impish to Beta

2124. By Łukasz Zemczak on 2021-09-06

bionic: DEBVERSION=18.04.6

2123. By Steve Langasek on 2021-08-08

Merge lp:~mwhudson/debian-cd/lp-1922392-focal

2122. By Łukasz Zemczak on 2021-08-02

focal: DEBVERSION=20.04.3

2121. By Łukasz Zemczak on 2021-07-27

copy any yaml files from the livefs to the casper directory too and remove quiet from the default live-server command line on s390x too

2120. By Steve Langasek on 2021-04-29

Reverse the handling of xorriso vs mkisofs: xorriso is now the default going forward, and mkisofs is only supported on bionic and focal.

2119. By Łukasz Zemczak on 2021-04-23

Copy hirsute -> impish, and add impish to CONF.sh

2118. By Łukasz Zemczak on 2021-04-19

hirsute: Beta -> Release

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2021-10-05 08:01:22 +0000
@@ -0,0 +1,8 @@
+tasks/auto
+tasks/ubuntu
+tasks/kubuntu
+tasks/tocd3
+tasks/tocd3.1
+tasks/edubuntu
+tasks/ubuntu-server
+tasks/xubuntu

=== added file '.cvsignore'
--- .cvsignore	1970-01-01 00:00:00 +0000
+++ .cvsignore	2021-10-05 08:01:22 +0000
@@ -0,0 +1,3 @@
+install-stamp
+build-stamp
+log

=== added file 'CONF.sh'
--- CONF.sh	1970-01-01 00:00:00 +0000
+++ CONF.sh	2021-10-05 08:01:22 +0000
@@ -1,72 +1,340 @@
 #
 # This file will have to be sourced where needed
-
-# To prevent sourcing this file twice when using scripts to build CD images,
-# use the following code at the top of your script:
-#    CF=CONF.sh
-#    . $CF
-#    export DEBIAN_CD_CONF_SOURCED=true
-
-# Allow to prevent double sourcing of this file
-if [ "$DEBIAN_CD_CONF_SOURCED" = true ]; then
-	return 0
-fi
+#
 
 # Unset all optional variables first to start from a clean state
+unset NONUS             || true
+unset FORCENONUSONCD1   || true
 unset NONFREE           || true
 unset CONTRIB           || true
 unset EXTRANONFREE      || true
-unset LOCAL             || true
-unset LOCALDEBS         || true
+unset RESTRICTED        || true
+unset UNIVERSE          || true
+unset MULTIVERSE        || true
+# allow configuration on command line
+#unset LOCAL             || true
+#unset LOCALDEBS         || true
+unset SECURED           || true
+unset GPG_HOMEDIR       || true
+unset SIGNING_KEYID     || true
 unset SECURITY          || true
-unset PROPOSED_UPDATES  || true
 unset BOOTDIR           || true
+unset BOOTDISKS         || true
 unset SYMLINK           || true
 unset COPYLINK          || true
 unset MKISOFS           || true
 unset MKISOFS_OPTS      || true
 unset ISOLINUX          || true
 unset EXCLUDE           || true
+unset SRCEXCLUDE        || true
+unset NODEPENDS         || true
 unset NORECOMMENDS      || true
 unset NOSUGGESTS        || true
-unset IMAGESUMS         || true
+unset DOJIGDO           || true
 unset JIGDOTEMPLATEURL  || true
 unset JIGDOFALLBACKURLS || true
 unset JIGDOINCLUDEURLS  || true
 unset JIGDOSCRIPT       || true
 unset JIGDO_OPTS        || true
+unset DEFBINSIZE        || true
+unset DEFSRCSIZE        || true
+unset FASTSUMS          || true
 unset PUBLISH_URL       || true
+unset PUBLISH_NONUS_URL || true
 unset PUBLISH_PATH      || true
 unset UDEB_INCLUDE      || true
 unset UDEB_EXCLUDE      || true
 unset BASE_INCLUDE      || true
 unset BASE_EXCLUDE      || true
 unset INSTALLER_CD      || true
+unset DI_CODENAME       || true
 unset MAXCDS            || true
-unset MAXISOS           || true
-unset MAXJIGDOS         || true
-unset SPLASHPNG         || true
-unset OMIT_MANUAL	 || true
+unset OMIT_MANUAL	    || true
 unset OMIT_RELEASE_NOTES || true
-unset OMIT_DOC_TOOLS     || true
-unset MAX_PKG_SIZE       || true
-unset DEBOOTSTRAP_OPTS   || true
-unset ARCHIVE_KEYRING_PACKAGE || true
-unset ARCHIVE_KEYRING_FILE    || true
+
+if [ -z "$PROJECT" ]; then
+  PROJECT=ubuntu
+fi
+if [ -z "$CAPPROJECT" ]; then
+  CAPPROJECT="$(echo "$PROJECT" | perl -ne 'print ucfirst')"
+fi
+
+if [ -z "$DIST" ]; then
+  DIST=karmic
+fi
 
 # The debian-cd dir
 # Where I am (hoping I'm in the debian-cd dir)
 export BASEDIR=`pwd`
 
-# Name of the distribution for the image filename (Defaults to 'debian')
-# export CDNAME=debian
+case $DIST in
+  warty)
+    export CODENAME=warty
+    export CAPCODENAME='Warty Warthog'
+    export DEBVERSION=4.10
+    export OFFICIAL="Linux+ Edition"
+    ;;
+  hoary)
+    export CODENAME=hoary
+    export CAPCODENAME='Hoary Hedgehog'
+    export DEBVERSION=5.04
+    export OFFICIAL="Release"
+    ;;
+  breezy)
+    export CODENAME=breezy
+    export CAPCODENAME='Breezy Badger'
+    export DEBVERSION=5.10
+    export OFFICIAL="Release"
+    ;;
+  dapper)
+    export CODENAME=dapper
+    export CAPCODENAME='Dapper Drake'
+    export DEBVERSION=6.06.2
+    export OFFICIAL="Release"
+    ;;
+  edgy)
+    export CODENAME=edgy
+    export CAPCODENAME='Edgy Eft'
+    export DEBVERSION=6.10
+    export OFFICIAL="Release"
+    ;;
+  feisty)
+    export CODENAME=feisty
+    export CAPCODENAME='Feisty Fawn'
+    export DEBVERSION=7.04
+    export OFFICIAL="Release"
+    ;;
+  gutsy)
+    export PREV_CODENAME=feisty
+    export CODENAME=gutsy
+    export CAPCODENAME='Gutsy Gibbon'
+    export DEBVERSION=7.10
+    export OFFICIAL="Release"
+    ;;
+  hardy)
+    export PREV_CODENAME=dapper # need to support upgrades from previous LTS
+    export CODENAME=hardy
+    export CAPCODENAME='Hardy Heron'
+    export DEBVERSION=8.04.4
+    export OFFICIAL="Release"
+    ;;
+  intrepid)
+    export PREV_CODENAME=hardy
+    export CODENAME=intrepid
+    export CAPCODENAME='Intrepid Ibex'
+    export DEBVERSION=8.10
+    export OFFICIAL="Release"
+    ;;
+  jaunty)
+    export PREV_CODENAME=intrepid
+    export CODENAME=jaunty
+    export CAPCODENAME='Jaunty Jackalope'
+    export DEBVERSION=9.04
+    export OFFICIAL="Release"
+    ;;
+  karmic)
+    export PREV_CODENAME=jaunty
+    export CODENAME=karmic
+    export CAPCODENAME='Karmic Koala'
+    export DEBVERSION=9.10
+    export OFFICIAL="Release"
+    ;;
+  lucid)
+    export PREV_CODENAME=karmic
+    export CODENAME=lucid
+    export CAPCODENAME='Lucid Lynx'
+    export DEBVERSION=10.04.4
+    case $PROJECT in
+      ubuntu|ubuntu-server|kubuntu)
+	DEBVERSION="$DEBVERSION LTS"
+	;;
+    esac
+    export BACKPORT_KERNELS="oneiric"
+    export OFFICIAL="Release"
+    ;;
+  maverick)
+    export PREV_CODENAME=lucid
+    export CODENAME=maverick
+    export CAPCODENAME='Maverick Meerkat'
+    export DEBVERSION=10.10
+    export OFFICIAL="Release"
+    ;;
+  natty)
+    export PREV_CODENAME=maverick
+    export CODENAME=natty
+    export CAPCODENAME='Natty Narwhal'
+    export DEBVERSION=11.04
+    export OFFICIAL="Release"
+    ;;
+  oneiric)
+    export PREV_CODENAME=natty
+    export CODENAME=oneiric
+    export CAPCODENAME='Oneiric Ocelot'
+    export DEBVERSION=11.10
+    export OFFICIAL="Release"
+    ;;
+  precise)
+    export PREV_CODENAME=lucid # need to support upgrades from previous LTS
+    export CODENAME=precise
+    export CAPCODENAME='Precise Pangolin'
+    export DEBVERSION=12.04.5
+    case $PROJECT in
+      ubuntu|ubuntu-server|kubuntu|edubuntu*|xubuntu)
+	DEBVERSION="$DEBVERSION LTS"
+	;;
+    esac
+    # Note that this is singular, unlike lucid; we only ship a single kernel.
+    case $PROJECT in
+      ubuntu|ubuntu-server|edubuntu*|mythbuntu)
+	export BACKPORT_KERNEL=trusty
+	;;
+    esac
+    export OFFICIAL="Release"
+    ;;
+  quantal)
+    export PREV_CODENAME=precise
+    export CODENAME=quantal
+    export CAPCODENAME='Quantal Quetzal'
+    export DEBVERSION=12.10
+    export OFFICIAL="Release"
+    ;;
+  raring)
+    export PREV_CODENAME=quantal
+    export CODENAME=raring
+    export CAPCODENAME='Raring Ringtail'
+    export DEBVERSION=13.04
+    export OFFICIAL="Release"
+    ;;
+  saucy)
+    export PREV_CODENAME=raring
+    export CODENAME=saucy
+    export CAPCODENAME='Saucy Salamander'
+    export DEBVERSION=13.10
+    export OFFICIAL="Release"
+    ;;
+  trusty)
+    export PREV_CODENAME=precise
+    export CODENAME=trusty
+    export CAPCODENAME='Trusty Tahr'
+    export DEBVERSION="14.04.6 LTS"
+    export BACKPORT_KERNEL=xenial
+    export OFFICIAL="Release"
+    ;;
+  utopic)
+    export PREV_CODENAME=trusty
+    export CODENAME=utopic
+    export CAPCODENAME='Utopic Unicorn'
+    export DEBVERSION="14.10"
+    export OFFICIAL="Release"
+    ;;
+  vivid)
+    export PREV_CODENAME=utopic
+    export CODENAME=vivid
+    export CAPCODENAME='Vivid Vervet'
+    export DEBVERSION="15.04"
+    export OFFICIAL="Release"
+    ;;
+  wily)
+    export PREV_CODENAME=vivid
+    export CODENAME=wily
+    export CAPCODENAME='Wily Werewolf'
+    export DEBVERSION="15.10"
+    export OFFICIAL="Release"
+    ;;
+  xenial)
+    export PREV_CODENAME=wily
+    export CODENAME=xenial
+    export CAPCODENAME='Xenial Xerus'
+    export DEBVERSION="16.04.7 LTS"
+    export BACKPORT_KERNEL="hwe-16.04"
+    export OFFICIAL="Release"
+    ;;
+  yakkety)
+    export PREV_CODENAME=xenial
+    export CODENAME=yakkety
+    export CAPCODENAME='Yakkety Yak'
+    export DEBVERSION="16.10"
+    export OFFICIAL="Release"
+    ;;
+  zesty)
+    export PREV_CODENAME=yakkety
+    export CODENAME=zesty
+    export CAPCODENAME='Zesty Zapus'
+    export DEBVERSION="17.04"
+    export OFFICIAL="Release"
+    ;;
+  artful)
+    export PREV_CODENAME=zesty
+    export CODENAME=artful
+    export CAPCODENAME='Artful Aardvark'
+    export DEBVERSION="17.10"
+    export OFFICIAL="Release"
+    ;;
+  bionic)
+    export PREV_CODENAME=artful
+    export CODENAME=bionic
+    export CAPCODENAME='Bionic Beaver'
+    export DEBVERSION="18.04.6 LTS"
+    export BACKPORT_KERNEL="hwe-18.04"
+    export OFFICIAL="Release"
+    ;;
+  cosmic)
+    export PREV_CODENAME=bionic
+    export CODENAME=cosmic
+    export CAPCODENAME='Cosmic Cuttlefish'
+    export DEBVERSION="18.10"
+    export OFFICIAL="Release"
+    ;;
+  disco)
+    export PREV_CODENAME=cosmic
+    export CODENAME=disco
+    export CAPCODENAME='Disco Dingo'
+    export DEBVERSION="19.04"
+    export OFFICIAL="Release"
+    ;;
+  eoan)
+    export PREV_CODENAME=disco
+    export CODENAME=eoan
+    export CAPCODENAME='Eoan Ermine'
+    export DEBVERSION="19.10"
+    export OFFICIAL="Release"
+    ;;
+  focal)
+    export PREV_CODENAME=eoan
+    export CODENAME=focal
+    export CAPCODENAME='Focal Fossa'
+    export DEBVERSION="20.04.3 LTS"
+    export BACKPORT_KERNEL="hwe-20.04"
+    export OFFICIAL="Release"
+    ;;
+  groovy)
+    export PREV_CODENAME=focal
+    export CODENAME=groovy
+    export CAPCODENAME='Groovy Gorilla'
+    export DEBVERSION="20.10"
+    export OFFICIAL="Release"
+    ;;
+  hirsute)
+    export PREV_CODENAME=groovy
+    export CODENAME=hirsute
+    export CAPCODENAME='Hirsute Hippo'
+    export DEBVERSION="21.04"
+    export OFFICIAL="Release"
+    ;;
+  impish)
+    export PREV_CODENAME=hirsute
+    export CODENAME=impish
+    export CAPCODENAME='Impish Indri'
+    export DEBVERSION="21.10"
+    export OFFICIAL="Daily"
+    ;;
 
-# Building wheezy cd set ...
-export CODENAME=wheezy
+esac
 
 # By default use Debian installer packages from $CODENAME
-if [ -z "$DI_CODENAME" ]; then
-	export DI_CODENAME=$CODENAME
+if [ ! "$DI_CODENAME" ]
+then
+  export DI_CODENAME=$CODENAME
 fi
 
 # If set, controls where the d-i components are downloaded from.
@@ -75,33 +343,13 @@
 # the Debian mirror.
 #export DI_WWW_HOME=default
 
-# Version number, "2.2 r0", "2.2 r1" etc.
-export DEBVERSION="7.0"
-
-# Official or non-official set.
-# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
-# ON THE OFFICIAL DEBIAN CD WEBSITE http://cdimage.debian.org
-export OFFICIAL="Unofficial"
-#export OFFICIAL="Official"
-#export OFFICIAL="Official Beta"
-
-# ... for arch
-if [ -z "$ARCHES" ]; then
-	CPU=`dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || true`
-	if [ -z "$CPU" ]; then
-		CPU=`dpkg-architecture -qDEB_HOST_ARCH`
-	fi
-	KERNEL=`dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || true`
-	if [ -z "$KERNEL" ]; then
-		KERNEL=linux
-	fi
-	if [ $KERNEL = linux ] ; then
-		ARCHES=$CPU
-	else
-		ARCHES="$KERNEL-$CPU"
-	fi
-	export ARCHES
-fi
+# installer for properly uploaded debian-installer builds, daily-installer
+# for autobuilt dailies. The newest available version is selected
+# automatically; this is an override.
+#export DI_TYPE=installer
+
+# ... for arch  
+export ARCH=`dpkg --print-architecture`
 
 # IMPORTANT : The 4 following paths must be on the same partition/device.
 #	      If they aren't then you must set COPYLINK below to 1. This
@@ -109,32 +357,52 @@
 #	      images, however. Also, if you are using an NFS partition for
 #	      some part of this, you must use this option.
 # Paths to the mirrors
-export MIRROR=/srv/mirror/debian
+export MIRROR=${MIRROR:-$CDIMAGE_ROOT/ftp}
+
+# Comment the following line if you don't have/want non-US
+#export NONUS=/ftp/debian-non-US
+
+# And this option will make you 2 copies of CD1 - one with all the
+# non-US packages on it, one with none. Useful if you're likely to
+# need both.
+#export FORCENONUSONCD1=1
 
 # Path of the temporary directory
-export TDIR=/srv/mirror/tmp
+export TDIR=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/tmp
 
 # Path where the images will be written
-export OUT=/srv/mirror/debian-cd-test
+export OUT=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/debian-cd
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.
-export APTTMP=/srv/mirror/tmp/apt
+export APTTMP=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/apt
+
+# Where extracted debootstrap scripts live
+export DEBOOTSTRAP=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/debootstrap
+
+# Where live filesystem images live
+export LIVEIMAGES=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/live
 
 # Do I want to have NONFREE merged in the CD set
 # export NONFREE=1
 
 # Do I want to have CONTRIB merged in the CD set
-export CONTRIB=1
+#export CONTRIB=1
 
 # Do I want to have NONFREE on a separate CD (the last CD of the CD set)
 # WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
 # export EXTRANONFREE=1
 
-# Do I want to force (potentially non-free) firmware packages to be
-# placed on disc 1? Will make installation much easier if systems
-# contain hardware that depends on this firmware
-# export FORCE_FIRMWARE=1
+if [ -z "$CDIMAGE_ONLYFREE" ]; then
+  export RESTRICTED=1
+fi
+
+if [ "$CDIMAGE_UNSUPPORTED" ]; then
+  export UNIVERSE=1
+  if [ -z "$CDIMAGE_ONLYFREE" ]; then
+    export MULTIVERSE=1
+  fi
+fi
 
 # If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with 
 # local packages that you want to put on the CD set then
@@ -144,17 +412,35 @@
 # If your local packages are not under $MIRROR, but somewhere else, 
 # you can uncomment this line and edit to to point to a directory
 # containing dists/$CODENAME/local/binary-$ARCH
-# export LOCALDEBS=/home/joey/debian/va/debian
+# export LOCALDEBS=$CDIMAGE_ROOT/local/packages
+
+# If you want a <codename>-secured tree with a copy of the signed
+# Release.gpg and files listed by this Release file, then
+# uncomment this line
+# export SECURED=1
+
+case $DIST in
+  warty) ;;
+  hoary|breezy|dapper|edgy|feisty|gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily)
+    export GPG_HOMEDIR=$CDIMAGE_ROOT/secret/dot-gnupg/
+    export SIGNING_KEYID=C5986B4F1257FFA86632CBA746181433FBB75451
+    ;;
+  *)
+    export GPG_HOMEDIR=$CDIMAGE_ROOT/secret/dot-gnupg/
+    export SIGNING_KEYID=843938DF228D22F7B3742BC0D94AA3F0EFE21092
+    ;;
+esac
 
 # Where to find the security patches.  This directory should be the
 # top directory of a security.debian.org mirror.
-#export SECURITY="$TOPDIR"/debian/debian-security
+case $DIST in
+  warty|hoary|breezy|dapper|edgy|feisty|gutsy|hardy|intrepid|jaunty|karmic|lucid)
+    export SECURITY="$MIRROR"
+    ;;
+esac
 
-# Include proposed updates
-# Note that on the CDs it will not be visible where packages came from:
-# from the released archive or from proposed updates archive.
-# NOTE: intended to be used for pre-release testing, not for publication!
-#export PROPOSED_UPDATES=$CODENAME-proposed-updates
+# Use post-release updates?
+export UPDATES=1
 
 # Sparc only : bootdir (location of cd.b and second.b)
 # export BOOTDIR=/boot
@@ -168,7 +454,7 @@
 # export COPYLINK=1
 
 # Options
-# export MKISOFS=mkisofs
+# export MKISOFS=/usr/bin/mkisofs
 # export MKISOFS_OPTS="-r"		#For normal users
 # export MKISOFS_OPTS="-r -F ."	#For symlink farmers
 
@@ -176,21 +462,28 @@
 # mkisofs/genisoimage. Allows creation of isohybrid images: ISO images
 # that will burn correctly onto a CD and also can be written raw to a
 # USB stick. xorriso 0.6.5 and later has working support for this.
-#export i386_MKISOFS="xorriso"
-#export i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
-#export amd64_MKISOFS="xorriso"
-#export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
-
-# Keyring (defaults):
-#ARCHIVE_KEYRING_PACKAGE=debian-archive-keyring
-# The path to the keyring file relative to $TDIR/archive-keyring/
-#ARCHIVE_KEYRING_FILE=usr/share/keyrings/debian-archive-keyring.gpg
-
-# By default we use debootstrap --no-check-gpg to find out the minimal set
-# of packages because there's no reason to not trust the local mirror. But
-# you can be paranoid and then you need to indicate the keyring to use to
-# validate the mirror.
-#export DEBOOTSTRAP_OPTS="--keyring $TDIR/archive-keyring/$ARCHIVE_KEYRING_FILE"
+export i386_MKISOFS="xorriso"
+export i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+export amd64_MKISOFS="xorriso"
+export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+export arm64_MKISOFS="xorriso"
+export arm64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+
+case $DIST in
+  bionic|focal)
+    # temporary hack until such time as we can upgrade all builds to 1.4.2
+    new_xorriso="/home/cdimage/xorriso/xorriso-1.2.4/xorriso/xorriso"
+    if [ -x "$new_xorriso" ]; then
+      export amd64_MKISOFS="$new_xorriso"
+      export arm64_MKISOFS="$new_xorriso"
+    fi
+    ;;
+  *)
+    # switch to modern xorriso for all arches
+    export MKISOFS=xorriso
+    export MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+    ;;
+esac
 
 # ISOLinux support for multiboot on CD1 for i386
 export ISOLINUX=1
@@ -198,80 +491,79 @@
 # uncomment this to if you want to see more of what the Makefile is doing
 #export VERBOSE_MAKE=1
 
-# The maximum size allowed for an individual package, in bytes; if
-# larger than this, it will be excluded (and all dependents, of
-# course). We'll create a README.excluded in the root of CD1 listing
-# them too
-export MAX_PKG_SIZE=600000000
-
-# Should build_all.sh try to build a simple CD image if the proper official
-# CD run does not work?
-ATTEMPT_FALLBACK=yes
-
-# Set your disk type here. Known types are:
-# BC (businesscard): 650 MiB max (should be limited elsewhere,
-#                    should never fill a CD anyway)
-# NETINST:           650 MiB max (ditto)
-# CD:                standard 74-min CD (650 MiB)
-# CD700:             (semi-)standard 80-min CD (700 MiB)
-# DVD:               standard 4.7 GB DVD
-# DLDVD:             standard 8.5 GB dual-layer DVD
-# BD:                standard 25 GB blu-ray
-# DLBD:              standard 50 GB dual-layer blu-ray
-# STICK1GB:          1GB USB stick or similar
-# STICK2GB:          2GB USB stick or similar
-# STICK4GB:          4GB USB stick or similar
-# STICK8GB:          8GB USB stick or similar
-# CUSTOM:            up to you - specify a size to go with it (in 2K blocks)
-export DISKTYPE=CD
-#export DISKTYPE=CUSTOM
-#export CUSTOMSIZE=XXXX
-# If you want to over-ride this choice (e.g. to make a larger version of a given disk),
-# you can do the following:
-# export FORCE_CD_SIZE=<type> to change all the sizes in a given run
-# export FORCE_CD_SIZE1=<type> to change the size of disk 1 (only)
-
-# Extra variants to enable. See docs/README.variants for more information.
-export VARIANTS=
+# uncoment this to make build_all.sh try to build a simple CD image if
+# 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.  For DVD-R the size limit is 4700372992 (see ubuntu-cdimage
+# lib/cdimage/tree.py:DailyTreePublisher.size_limit) but we express here
+# in MiB, so round down to 4482MiB (4699717632 bytes).  If we round up to
+# 4483MiB we will *probably* still fit, but the limit would be 384KiB above
+# the actual limit so there's some risk of being oversize for media.
+if [ "$CDIMAGE_DVD" = 1 ]; then
+  export DEFBINSIZE=4482
+  export DEFSRCSIZE=4482
+else
+  #export DEFBINSIZE=700
+  #export DEFSRCSIZE=645
+  export DEFBINSIZE=4600
+  export DEFSRCSIZE=4600
+fi
 
 # We don't want certain packages to take up space on CD1...
-#export EXCLUDE1=exclude
-# ...but they are okay for other CDs (UNEXCLUDEx == may be included
-# on CD x if not already covered)
-#export UNEXCLUDE2=unexclude-CD2
-# Any packages listed in EXCLUDEx but not in any UNEXCLUDE will be
-# excluded completely. The same goes for packages listed in EXCLUDE.
+#export EXCLUDE="$BASEDIR"/tasks/exclude-sarge
+# ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x)
+#export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-sarge
+# Any packages listed in EXCLUDE but not in any UNEXCLUDE will be
+# excluded completely.
+
+# We also exclude some source packages
+#export SRCEXCLUDE="$BASEDIR"/tasks/exclude-src-potato
+
+export NODEPENDS=1
 
 # Set this if the recommended packages should be skipped when adding 
-# package on the CD.  The default is 'true'.
-# export NORECOMMENDS=1
+# package on the CD.  The default is 'false'.
+export NORECOMMENDS=1
 
 # Set this if the suggested packages should be skipped when adding 
 # package on the CD.  The default is 'true'.
-# export NOSUGGESTS=1
-
-# Set to 1 to generate MD5/SHA1/SHA256/SHA512 sums for generated images
-export IMAGESUMS=1
-
-# And define the set of checksum algorithms you want here. Default is
-# all of: md5 sha1 sha512 sha256
-# export CHECKSUMS="md5 sha1 sha512 sha256"
-
-# We may have to extract files from packages to put them onto the CD
-# (e.g. bootloader files). If you make those packages (and their
-# sources) available somewhere, list it here so that README.source
-# can point to it. Note that your mirror must have repositories of
-# source packages if you enable this option.
-# export ARCHIVE_EXTRACTED_SOURCES="http://cdimage.debian.org/cdimage/cd-sources/"
-
-# Produce iso/jigdo files: specify how many iso/jigdo files should be
-# produced in your set. If not set or when the value is "ALL" they will
-# be created for all images. One of the variables can be set to zero if
-# either iso or jigdo files are not wanted.
-# Replaces the old "DOJIGDO" setting with something much more flexible.
-#export MAXISOS=0
-#export MAXJIGDOS=0
-
+export NOSUGGESTS=1
+
+# Image format:
+# vfat = Output an image in VFAT format (.img)
+# iso  = Output an image in ISO 9660 format (.iso)
+if [ -z "$IMAGE_FORMAT" ]; then
+  export IMAGE_FORMAT=iso
+fi
+
+# Preinstalled Image Filesystem
+# This is the expected filesystem that is downloaded from the livefs builders
+
+if [ -z "$PREINSTALLED_IMAGE_FILESYSTEM" ]; then
+  export PREINSTALLED_IMAGE_FILESYSTEM=ext4
+fi
+
+# Produce jigdo files:
+# 0/unset = Don't do jigdo at all, produce only the full iso image.
+# 1 = Produce both the iso image and jigdo stuff.
+# 2 = Produce ONLY jigdo stuff; no iso image is created (saves lots
+#     of disk space).
+
+if [ "$CDIMAGE_INSTALL" != 1 ] && [ "$CDIMAGE_ONLYSOURCE" != 1 ]; then
+  # inappropriate
+  export DOJIGDO=0
+elif [ "$DIST" = warty ]; then
+  # only custom builds now
+  export DOJIGDO=0
+elif [ "$SPECIAL" = 1 ]; then
+  # special custom build
+  export DOJIGDO=0
+else
+  export DOJIGDO=1
+fi
 # HTTP/FTP URL for directory where you intend to make the templates
 # available. You should not need to change this; the default value ""
 # means "template in same dir as the .jigdo file", which is usually
@@ -291,13 +583,16 @@
 # Space-separated list of label->URL mappings for "jigdo fallback
 # server(s)" to add to .jigdo file. If unset, no fallback URL is
 # added, which may cause problems - see README.
-#export JIGDOFALLBACKURLS="Debian=http://myserver/snapshot/Debian/ Non-US=http://myserver/snapshot/Non-US/"
+export JIGDOFALLBACKURLS="Debian=http://archive.ubuntu.com/ubuntu/"
+# commented out until the snapshot archives actually exist to avoid
+# silly server load
+#export JIGDOFALLBACKURLS="Debian=http://archive.ubuntu.com/cdimage/jigit/$CODENAME/snapshot/"
 #
 # Space-separated list of "include URLs" to add to the .jigdo file. 
 # The included files are used to provide an up-to-date list of Debian
 # mirrors to the jigdo _GUI_application_ (_jigdo-lite_ doesn't support
 # "[Include ...]").
-export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigdo"
+#export JIGDOINCLUDEURLS="http://cdimage.debian.org/debian-cd/debian-servers.jigdo"
 #
 # $JIGDOTEMPLATEURL and $JIGDOINCLUDEURLS are passed to
 # "tools/jigdo_header", which is used by default to generate the
@@ -306,39 +601,45 @@
 # data.
 #export JIGDOSCRIPT="myscript"
 
+# If set, use the md5sums from the main archive, rather than calculating
+# them locally
+export FASTSUMS=1
+
 # A couple of things used only by publish_cds, so it can tweak the
 # jigdo files, and knows where to put the results.
 # You need to run publish_cds manually, it is not run by the Makefile.
 export PUBLISH_URL="http://cdimage.debian.org/jigdo-area"
+export PUBLISH_NONUS_URL="http://non-US.cdimage.debian.org/jigdo-area"
 export PUBLISH_PATH="/home/jigdo-area/"
 
 # Specify files and directories to *exclude* from jigdo processing. These
 # files on each CD are expected to be different to those on the mirror, or
 # are often subject to change. Any files matching entries in this list will
 # simply be placed straight into the template file.
-export JIGDO_EXCLUDE="'README*' /doc/ /md5sum.txt /.disk/ /pics/ 'Release*' 'Packages*' 'Sources*'"
+export JIGDO_EXCLUDE="'README*' /doc/ /md5sum.txt /.disk/ /pics/ 'Release*' 'Packages*' 'Sources*' 'Contents*'"
 
-# Specify files that MUST match entries in the externally-supplied
-# md5-list. If they do not, the CD build process will fail; something
-# must have been corrupted. Replaces the old mirrorcheck code.
+# Specify files and directories to *exclude* from jigdo processing. These
+# files on each CD are expected to be different to those on the mirror, or
+# are often subject to change. Any files matching entries in this list will
+# simply be placed straight into the template file.
 export JIGDO_INCLUDE="/pool/"
 
 # 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 1024"
 
-for EXCL in $JIGDO_EXCLUDE; do
-	JIGDO_OPTS="$JIGDO_OPTS -jigdo-exclude $EXCL"
-done
-
-for INCL in $JIGDO_INCLUDE; do
-	JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL"
-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=Debian=http://snapshot.debian.org/archive/debian/SNAPDATETIME/
+for EXCL in $JIGDO_EXCLUDE
+do
+    JIGDO_OPTS="$JIGDO_OPTS -jigdo-exclude $EXCL"
+done
+
+for INCL in $JIGDO_INCLUDE
+do
+    JIGDO_OPTS="$JIGDO_OPTS -jigdo-force-md5 $INCL"
+done
+
+# Where to find the boot disks
+#export BOOTDISKS=$TOPDIR/ftp/skolelinux/boot-floppies
 
 # File with list of packages to include when fetching modules for the
 # first stage installer (debian-installer). One package per line.
@@ -359,28 +660,56 @@
 # File with list of packages to exclude as above.
 #export BASE_EXCLUDE="$BASEDIR"/data/$CODENAME/base_exclude
 
-# Only put the installer onto the cd (set NORECOMMENDS,... as well,
-# and if you're not using build.sh then also make sure you set TASK
-# appropriately here)
+# Only put the installer onto the cd (set NORECOMMENDS,... as well).
 # INSTALLER_CD=0: nothing special (default)
-# INSTALLER_CD=1: just add debian-installer (use TASK=debian-installer)
-# INSTALLER_CD=2: add d-i and base (use TASK=debian-installer+kernel)
-#export INSTALLER_CD=2
-#export TASK=debian-installer+kernel
-
-# Parameters to pass to kernel (or d-i) when the CD boots. Not currently
-# supported for all architectures.
-#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
-
-# Default desktop (currently only used by win32-loader)
-#export DESKTOP=kde
-
-# If set, limits the number of images to produce. The maximum
-# value of MAXISOS and MAXJIGDOS are limited to this setting.
-#export MAXCDS=1
+# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer-$CODENAME)
+# INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel-$CODENAME)
+#export INSTALLER_CD=0
+
+# Parameters to pass to kernel when the CD boots. Not currently supported
+# for all architectures.
+#export KERNEL_PARAMS="priority=critical"
+
+# If set, limits the number of binary CDs to produce.
+if [ "$CDIMAGE_DVD" = 1 ]; then
+	export MAXCDS=1
+else
+	case $PROJECT in
+		edubuntu)
+			case $DIST in
+				warty|hoary|breezy|dapper|edgy)
+					export MAXCDS=1
+					;;
+				*)
+					export MAXCDS=2
+					;;
+			esac
+			;;
+		*)
+			export MAXCDS=1
+			;;
+	esac
+fi
+
+# If set to 0, never overflow binary CDs (for when you only want a single CD
+# and want to know when it overflows).
+export OVERFLOWBINCDS=0
 
 # If set, overrides the boot picture used.
-#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
+if [ -z "$SPLASHRLE" ]; then
+	export SPLASHRLE="$BASEDIR/data/$DI_CODENAME/splash.rle"
+fi
+if [ -z "$GFXSPLASH" ]; then
+	export GFXSPLASH="$BASEDIR/data/$DI_CODENAME/splash.pcx"
+fi
+if [ -z "$SPLASHPNG" ]; then
+	export SPLASHPNG="$BASEDIR/data/$DI_CODENAME/splash.png"
+fi
+
+# Used by build.sh to determine what to build, this is the name of a target
+# in the Makefile. Use bin-official_images to build only binary CDs. The
+# default, official_images, builds everything.
+IMAGETARGET=bin-official_images
 
 # Set to 1 to save space by omitting the installation manual. 
 # If so the README will link to the manual on the web site.
@@ -388,76 +717,9 @@
 
 # Set to 1 to save space by omitting the release notes
 # If so we will link to them on the web site.
-export OMIT_RELEASE_NOTES=1
+export OMIT_RELEASE_NOTES=0
 
-# Set this to override the default location
+# Set this to override the defaul location
 #export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
 
-# Set to 1 to not include the doc/tools directories on CD1
-# Useful to save space and avoids failures if you have a mirror
-# without those directories.
-#export OMIT_DOC_TOOLS=1
-
-case "$OFFICIAL" in
-    "Official")
-	export OFFICIAL_VAL=2
-	;;
-    "Official Beta")
-	export OFFICIAL_VAL=1
-	;;
-    *)
-	export OFFICIAL_VAL=0
-	;;
-esac
-
-# Set this to force the Release file(s) to say "stable". Used in first
-# Etch builds to allow us to build before the archive updated
-#EARLY_BUILD_HACK=1
-
-##################################
-# LOCAL HOOK DEFINITIONS
-##################################
-#
-# Set these to point to scripts/programs to be called at various 
-# points in the debian-cd image-making process. This is the ideal place
-# to customise what's on the CDs, for example to add extra files or
-# modify existing ones. Each will be called with the arguments in order:
-#
-# $TDIR (the temporary dir containing the build tree)
-# $MIRROR (the location of the mirror)
-# $DISKNUM (the image number in the set)
-# $CDDIR (the root of the temp disc tree)
-# $ARCHES (the set of architectures chosen)
-#
-# BE CAREFUL about what you do at each point: in the first couple of 
-# cases, files and directories you're looking to use may not exist yet,
-# you may need to worry about adding entries into md5sum.txt yourself
-# and (in the last couple of cases) if you add any extra files you may
-# end up over-filling the disc. If you *do* need to add files at the end
-# of the process, see RESERVED_BLOCKS_HOOK below. It's strongly
-# recommended to do this kind of customisation up-front if you can, it's
-# much simpler that way!
-
-# The disc_start hook. This will be called near the beginning of the
-# start_new_disc script, just after the directory tree has been created
-# but before any files have been added
-#export DISC_START_HOOK=/bin/true
-
-# The disc_pkg hook. This will be called just after the
-# start_new_disc script has finished, just before make_disc_trees.pl
-# starts to add package files.
-#export DISC_PKG_HOOK=/bin/true
-
-# The reserved_blocks hook; if set, this script should print the
-# number of 2K blocks that need to be reserved for data to be added
-# *after* a disc tree is filled with packages.
-#export RESERVED_BLOCKS_HOOK=/bin/true
-
-# The disc_finish hook. This will be called once a disc image is full,
-# just after the last package rollback but before the last bits of
-# cleanup are done on the temp disc tree
-#export DISC_FINISH_HOOK=/bin/true
-
-# The disc_end hook. This will be called *right* at the end of the
-# image-making process in make_disc_trees.pl.
-#export DISC_END_HOOK=/bin/true
+COMPLETE=0

=== renamed file 'CONF.sh' => 'CONF.sh.moved'
=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2021-10-05 08:01:22 +0000
@@ -1,32 +1,84 @@
 #!/usr/bin/make -f
 
-# Main Makefile for debian-cd
+# Main Makefile for YACS
 #
-# Copyright 1999 Rapha?l Hertzog <[e-mail]>
+# Copyright 1999 Raphaël Hertzog <[e-mail]>
 # See the README file for the license
-#
-# Significantly modified 2005-2006 Steve McIntyre <[e-mail]>
-# for multi-arch and mixed bin/src discs
-#
+
 # The environment variables must have been set
 # before. For this you can source the CONF.sh 
 # file in your shell
 
 
 ## DEFAULT VALUES
+ifdef SUBARCH
+export FULLARCH=$(ARCH)+$(SUBARCH)
+else
+export FULLARCH=$(ARCH)
+endif
 ifndef VERBOSE_MAKE
 Q=@
 endif
+ifndef SIZELIMIT
+export SIZELIMIT=$(shell echo -n $$[ 690 * 1024 * 1024 ])
+endif
 ifndef TASK
-TASK=Debian-generic
+ifneq (,$(wildcard $(BASEDIR)/tasks/auto/$(IMAGE_TYPE)/$(PROJECT)/$(DIST)/MASTER))
+TASK=$(BASEDIR)/tasks/auto/$(IMAGE_TYPE)/$(PROJECT)/$(DIST)/MASTER
+else
+TASK=$(BASEDIR)/tasks/$(CAPPROJECT)_$(CODENAME)
+endif
+endif
+ifndef CAPCODENAME
+CAPCODENAME:=$(shell perl -e "print ucfirst("$(CODENAME)")")
+endif
+ifndef BINDISKINFO
+ifneq ($(MAXCDS),1)
+export BINDISKINFO="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) Binary-$$num ($$DATE)"
+else
+export BINDISKINFO="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) ($$DATE)"
+endif
+endif
+ifndef SRCDISKINFO
+export SRCDISKINFO="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num ($$DATE)"
+endif
+# ND=No-Date versions for README
+ifndef BINDISKINFOND
+ifneq ($(MAXCDS),1)
+export BINDISKINFOND="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) Binary-$$num"
+else
+export BINDISKINFOND="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH)"
+endif
+endif
+ifndef SRCDISKINFOND
+export SRCDISKINFOND="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num"
+endif
+ifndef BINVOLID
+ifeq ($(ARCH),powerpc)
+ifneq ($(MAXCDS),1)
+BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc $$num"
+else
+BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc"
+endif
+else ifeq ($(ARCH),ppc64el)
+ifneq ($(MAXCDS),1)
+BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc64 $$num"
+else
+BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc64"
+endif
+else
+ifneq ($(MAXCDS),1)
+BINVOLID="$(CAPPROJECT) $(DEBVERSION) $(ARCH) $$num"
+else
+BINVOLID="$(CAPPROJECT) $(DEBVERSION) $(ARCH)"
+endif
+endif
+endif
+ifndef SRCVOLID
+SRCVOLID="$(CAPPROJECT) $(DEBVERSION) Source $$num"
 endif
 ifndef MKISOFS
-ifneq (,$(filter i386 amd64,$(ARCHES)))
-export MKISOFS=xorriso
-export MKISOFS_OPTS=-as mkisofs -r -checksum_algorithm_iso md5,sha1
-else
-export MKISOFS=$(shell which genisoimage mkisofs | head -1)
-endif
+export MKISOFS=/usr/bin/mkisofs
 endif
 ifndef MKISOFS_OPTS
 #For normal users
@@ -38,59 +90,215 @@
 HOOK=$(BASEDIR)/tools/$(CODENAME).hook
 endif
 ifndef ARCHIVE_KEYRING_PACKAGE
-ARCHIVE_KEYRING_PACKAGE=debian-archive-keyring
-endif
-ifndef ARCHIVE_KEYRING_FILE
-ARCHIVE_KEYRING_FILE=usr/share/keyrings/debian-archive-keyring.gpg
-endif
-
-export BUILD_DATE=$(shell date -u +%Y%m%d-%H:%M)
-export ARCHES_NOSRC=$(shell echo $(ARCHES) | sed 's/source//')
-ifeq ($(ARCHES),source)
-	export SOURCEONLY=yes
-endif
-ifeq ($(shell echo $(ARCHES) | sed 's/.*source.*/1/'),1)
-	export INC_SOURCE=yes
-endif
-
-UNDER_ARCHES=$(shell echo $(ARCHES) | sed 's/\ /_/g')
-ARCH_MKISOFS = ${${UNDER_ARCHES}_MKISOFS}
-ARCH_MKISOFS_OPTS = ${${UNDER_ARCHES}_MKISOFS_OPTS}
+ARCHIVE_KEYRING_PACKAGE=ubuntu-keyring
+endif
+ifneq "$(wildcard $(MIRROR)/dists/$(DI_CODENAME)/main/disks-$(ARCH))" ""
+ifndef BOOTDISKS
+export BOOTDISKS=$(MIRROR)/dists/$(DI_CODENAME)/main/disks-$(ARCH)
+endif
+endif
+ifndef DOJIGDO
+export DOJIGDO=0
+endif
+
+ifndef UDEB_INCLUDE
+# Netinst/businesscard CD have different udeb_include files
+ifeq ($(INSTALLER_CD),1)
+UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_businesscard_udeb_include
+endif
+ifeq ($(INSTALLER_CD),2)
+UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_netinst_udeb_include
+endif
+endif
+# Default udeb_include files.
+ifndef UDEB_INCLUDE
+UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_udeb_include
+endif
+
+ARCH_MKISOFS = ${${ARCH}_MKISOFS}
+ARCH_MKISOFS_OPTS = ${${ARCH}_MKISOFS_OPTS}
 ifneq (${ARCH_MKISOFS},)
     MKISOFS = ${ARCH_MKISOFS}
 endif
 ifneq (${ARCH_MKISOFS_OPTS},)
     MKISOFS_OPTS = ${ARCH_MKISOFS_OPTS}
 endif
-ifndef DEBOOTSTRAP_OPTS
-DEBOOTSTRAP_OPTS=--no-check-gpg
+
+ifeq ($(CDIMAGE_LIVE),1)
+LIVE_FILESYSTEM := 1
+else ifeq ($(CDIMAGE_SQUASHFS_BASE),1)
+LIVE_FILESYSTEM := 1
+else
+LIVE_FILESYSTEM :=
 endif
 
 ## Internal variables  
 apt=$(BASEDIR)/tools/apt-selection
-sort_deps=$(BASEDIR)/tools/sort_deps
-md5sum=md5sum
+list2cds=$(BASEDIR)/tools/list2cds
+list2src=$(BASEDIR)/tools/list2src
+cds2src=$(BASEDIR)/tools/cds2src
+master2tasks=$(BASEDIR)/tools/master2tasks
+mirrorcheck=$(BASEDIR)/tools/mirror_check
+add_packages=$(BASEDIR)/tools/add_packages
+add_dirs=$(BASEDIR)/tools/add_dirs
+add_bin_doc=$(BASEDIR)/tools/add-bin-doc
+scanpackages=$(BASEDIR)/tools/scanpackages
+scansources=$(BASEDIR)/tools/scansources
+add_files=$(BASEDIR)/tools/add_files
+set_mkisofs_opts=$(BASEDIR)/tools/set_mkisofs_opts
+strip_nonus_bin=$(BASEDIR)/tools/strip-nonUS-bin
+add_secured=$(BASEDIR)/tools/add_secured
+md5sum=/usr/bin/md5sum
+sha1sum=/usr/bin/sha1sum
+sha256sum=/usr/bin/sha256sum
+fastsums=$(BASEDIR)/tools/fast_sums
 jigdo_cleanup=$(BASEDIR)/tools/jigdo_cleanup
 grab_md5=$(BASEDIR)/tools/grab_md5
-make_image=$(BASEDIR)/tools/make_image
-merge_package_lists=$(BASEDIR)/tools/merge_package_lists
-update_popcon=$(BASEDIR)/tools/update_popcon
-update_tasks=$(BASEDIR)/tools/update_tasks
-grab_source_list=$(BASEDIR)/tools/grab_source_list
-which_deb=$(BASEDIR)/tools/which_deb
-
-BDIR=$(TDIR)/$(CODENAME)
-TASKDIR=$(BDIR)/tasks
-ADIR=$(APTTMP)
-DB_DIR=$(BDIR)/debootstrap
-
-export DEBOOTSTRAP_DIR := $(DB_DIR)/usr/share/debootstrap
-export PATH := $(DB_DIR)/usr/sbin:$(PATH)
-export BDIR
-export TASKDIR
+add_live_filesystem=$(BASEDIR)/tools/add_live_filesystem
+add_winfoss=$(BASEDIR)/tools/add_winfoss
+find_newest_installer=$(BASEDIR)/tools/find-newest-installer
+verbose=$(BASEDIR)/tools/verbose_command
+make_vfat_img=$(BASEDIR)/tools/make-vfat-img
+hardlink=$(BASEDIR)/tools/hardlink
+
+BDIR=$(TDIR)/$(CODENAME)-$(FULLARCH)
+ADIR=$(APTTMP)/$(CODENAME)-$(FULLARCH)
+SDIR=$(TDIR)/$(CODENAME)-src
+
+FIRSTDISKS=CD1 
+ifdef FORCENONUSONCD1
+FIRSTDISKS=CD1 CD1_NONUS
+forcenonusoncd1=1
+else
+forcenonusoncd1=0
+endif
+
+# we don't know how to generate ISOs for arm; force vfat images
+ifneq (,$(findstring $(ARCH),armel armhf))
+IMAGE_FORMAT := vfat
+endif
+
+# CDBASE = $(CODENAME)-$(FULLARCH)-$(1)
+ifeq ($(CDIMAGE_DVD),1)
+CDBASE = $(CODENAME)-dvd-$(FULLARCH)
+else
+ ifeq ($(CDIMAGE_PREINSTALLED),1)
+  ifeq ($(PROJECT),ubuntu-netbook)
+   CDBASE = $(CODENAME)-preinstalled-netbook-$(FULLARCH)
+  else
+   ifeq ($(PROJECT),ubuntu-headless)
+    CDBASE = $(CODENAME)-preinstalled-headless-$(FULLARCH)
+   else
+    ifeq ($(PROJECT),ubuntu-server)
+     CDBASE = $(CODENAME)-preinstalled-server-$(FULLARCH)
+    else
+     ifeq ($(PROJECT),kubuntu-mobile)
+      CDBASE = $(CODENAME)-preinstalled-mobile-$(FULLARCH)
+     else
+      CDBASE = $(CODENAME)-preinstalled-desktop-$(FULLARCH)
+     endif
+    endif
+   endif
+  endif
+ else 
+ ifeq ($(CDIMAGE_ADDON),1)
+  CDBASE = $(CODENAME)-addon-$(FULLARCH)
+ else
+  ifeq ($(CDIMAGE_INSTALL),1)
+   ifeq ($(PROJECT),edubuntu)
+    ifneq (,$(findstring $(CODENAME),warty hoary breezy dapper edgy))
+ CDBASE = $(CODENAME)-install-$(FULLARCH)
+    else
+ CDBASE = $(CODENAME)-$$(if test "$(1)" = 1; then echo server; else echo serveraddon; fi)-$(FULLARCH)
+    endif
+   else
+    ifneq (,$(findstring $(CODENAME),warty hoary breezy))
+ CDBASE = $(CODENAME)-install-$(FULLARCH)
+    else
+     ifeq ($(PROJECT),ubuntu-server)
+       ifeq ($(CODENAME),focal)
+         CDBASE = $(CODENAME)-legacy-server-$(FULLARCH)
+        else
+         CDBASE = $(CODENAME)-server-$(FULLARCH)
+       endif
+     else
+      ifeq ($(PROJECT),jeos)
+ CDBASE = $(CODENAME)-jeos-$(FULLARCH)
+      else
+ CDBASE = $(CODENAME)-alternate-$(FULLARCH)
+      endif
+     endif
+    endif
+   endif
+  else
+   ifeq ($(PROJECT),edubuntu)
+    ifneq (,$(findstring $(CODENAME),warty hoary breezy dapper edgy))
+ CDBASE = $(CODENAME)-live-$(FULLARCH)
+    else
+ CDBASE = $(CODENAME)-desktop-$(FULLARCH)
+    endif
+   else
+    ifneq (,$(findstring $(CODENAME),warty hoary breezy))
+ CDBASE = $(CODENAME)-live-$(FULLARCH)
+    else
+     ifeq ($(PROJECT),ubuntu-server)
+ CDBASE = $(CODENAME)-live-server-$(FULLARCH)
+     else
+      ifeq ($(PROJECT),ubuntu-mid)
+ CDBASE = $(CODENAME)-mid-$(FULLARCH)
+      else
+       ifeq ($(PROJECT),ubuntu-netbook)
+ CDBASE = $(CODENAME)-netbook-$(FULLARCH)
+       else
+        ifeq ($(PROJECT),kubuntu-netbook)
+ CDBASE = $(CODENAME)-netbook-$(FULLARCH)
+        else
+         ifeq ($(PROJECT),ubuntu-moblin-remix)
+ CDBASE = $(CODENAME)-moblin-remix-$(FULLARCH)
+         else
+          ifeq ($(PROJECT),kubuntu-mobile)
+ CDBASE = $(CODENAME)-mobile-$(FULLARCH)
+          else
+            ifeq ($(SUBPROJECT),canary)
+ CDBASE = $(CODENAME)-desktop-canary-$(FULLARCH)
+			else
+ CDBASE = $(CODENAME)-desktop-$(FULLARCH)
+			endif
+          endif
+         endif
+        endif
+       endif
+      endif
+     endif
+    endif
+   endif
+  endif
+ endif
+endif
+endif
+CDSRCBASE = $(CODENAME)-src-$(1)
+
+INSTALLER_TYPE := $(shell $(find_newest_installer))
+INSTALLER_VERSION := $(shell readlink $(MIRROR)/dists/$(CODENAME)/main/$(INSTALLER_TYPE)-$(ARCH)/current)
 
 ## DEBUG STUFF ##
 
+PrintVars:
+	@num=1; \
+	DATE=$${CDIMAGE_DATE:-`date +%Y%m%d`} ; \
+	echo BINDISKINFO: ; \
+        echo $(BINDISKINFO) ; \
+	echo SRCDISKINFO: ; \
+        echo $(SRCDISKINFO) ; \
+	echo BINDISKINFOND: ; \
+        echo $(BINDISKINFOND) ; \
+	echo SRCDISKINFOND: ; \
+        echo $(SRCDISKINFOND) ; \
+	echo BINVOLID: ; \
+        echo $(BINVOLID) ; \
+	echo SRCVOLID: ; \
+        echo $(SRCVOLID) ; \
+
 default:
 	@echo "Please refer to the README file for more information"
 	@echo "about the different targets available."
@@ -99,9 +307,6 @@
 
 # Basic checks in order to avoid problems
 ok:
-ifdef FORCE_FAIL
-	@echo Debug variable FORCE_FAIL defined -- abort now; false
-endif
 ifndef TDIR
 	@echo TDIR undefined -- set up CONF.sh; false
 endif
@@ -111,15 +316,12 @@
 ifndef MIRROR
 	@echo MIRROR undefined -- set up CONF.sh; false
 endif
-ifndef ARCHES
-	@echo ARCHES undefined -- set up CONF.sh; false
+ifndef ARCH
+	@echo ARCH undefined -- set up CONF.sh; false
 endif
 ifndef CODENAME
 	@echo CODENAME undefined -- set up CONF.sh; false
 endif
-ifndef DISKTYPE
-	@echo DISKTYPE undefined -- set up CONF.sh; false
-endif
 ifndef OUT
 	@echo OUT undefined -- set up CONF.sh; false
 endif
@@ -128,323 +330,1060 @@
 	@echo Never use NONFREE and EXTRANONFREE at the same time; false
 endif
 endif
-	@if [ $(DISKTYPE) = "NETINST" -o $(DISKTYPE) = "BC" ] ; then \
-		if [ "$(INC_SOURCE)"x = "yes"x ] ; then \
-			echo "Including source is not supported on a netinst/bc CD"; \
-			false; \
-		fi; \
-	fi
+ifdef FORCENONUSONCD1
+ifndef NONUS
+	@echo If we have FORCENONUSONCD1 set, we must also have NONUS set; false
+endif
+endif
 
 ## INITIALIZATION ##
 
 # Creation of the directories needed
-init: ok $(OUT) $(TDIR) $(BDIR) $(ADIR) $(TASKDIR) $(BDIR)/DATE $(DB_DIR) unstable-map
+init: ok $(OUT) $(TDIR) $(BDIR) $(SDIR) $(ADIR)
 $(OUT):
 	$(Q)mkdir -p $(OUT)
 $(TDIR):
 	$(Q)mkdir -p $(TDIR)
 $(BDIR):
 	$(Q)mkdir -p $(BDIR)
+$(SDIR):
+	$(Q)mkdir -p $(SDIR)
 $(ADIR):
 	$(Q)mkdir -p $(ADIR)
-$(TASKDIR):
-ifneq ($(ARCHES),source)
-	$(Q)echo "Updating task files..."
-	$(Q)mkdir -p $(TASKDIR)
-	$(Q)echo "- copying task files from 'tasks/$(DI_CODENAME)/'"
-	$(Q)cp -r $(BASEDIR)/tasks/$(CODENAME)/* $(TASKDIR)
-	$(Q)echo "- generating dynamic task files"
-	$(Q)set -e; cd $(TASKDIR); \
-		$(BASEDIR)/tools/update_tasks; \
-		$(BASEDIR)/tools/generate_di_list; \
-		$(BASEDIR)/tools/generate_di+k_list
-ifeq ($(FORCE_FIRMWARE),1)
-	# Generate firmware task file using the contents of the archive
-	$(Q)$(BASEDIR)/tools/generate_firmware_task "$(ARCHES)" $(TASKDIR)/firmware
-endif
-endif
-$(BDIR)/DATE:
-	$(Q)date -u '+%Y%m%d' > $(BDIR)/DATE
-	$(Q)date -u '+%Y%m%dT%H%M%SZ' > $(BDIR)/DATE-zulu
-
-ifdef MIRROR
-LATEST_DB := $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debootstrap)
-$(DB_DIR): $(LATEST_DB)
-	@rm -rf $(DB_DIR)
-	$(Q)dpkg -x $(LATEST_DB) $(DB_DIR)
-	$(Q)if [ ! -e $(DEBOOTSTRAP_DIR)/scripts/$(CODENAME) ] ; then \
-		ln -sf sid $(DEBOOTSTRAP_DIR)/scripts/$(CODENAME) ; \
-	fi
-endif
-
-# Make sure unstable/sid points to testing/wheezy, as there is no build
-# rule for unstable/sid.
-unstable-map:
-	$(Q)if [ ! -d $(BASEDIR)/data/sid ] ; then \
-		ln -s wheezy $(BASEDIR)/data/sid ; \
-	fi
-	$(Q)if [ ! -d $(BASEDIR)/tools/boot/sid ] ; then \
-		ln -s wheezy $(BASEDIR)/tools/boot/sid ; \
-	fi
-
-#################
-## CLEAN RULES ##
-#################
+	$(Q)mkdir -p $(ADIR)/apt-ftparchive-db
+
+## CLEANINGS ##
 
 # Cleans the current arch tree (but not packages selection info)
-clean: ok dir-clean
-dir-clean:
+clean: ok bin-clean src-clean
+bin-clean:
 	$(Q)rm -rf $(BDIR)/CD[1234567890]*
-	$(Q)rm -rf $(TASKDIR)
+	$(Q)rm -rf $(BDIR)/*_NONUS
 	$(Q)rm -f $(BDIR)/*.filelist*
-	$(Q)rm -f  $(BDIR)/packages-stamp $(BDIR)/upgrade-stamp $(BDIR)/md5-check
+	$(Q)rm -f  $(BDIR)/packages-stamp $(BDIR)/bootable-stamp \
+	         $(BDIR)/upgrade-stamp $(BDIR)/secured-stamp $(BDIR)/md5-check
+src-clean:
+	$(Q)rm -rf $(SDIR)/CD[1234567890]*
+	$(Q)rm -rf $(SDIR)/*_NONUS
+	$(Q)rm -rf $(SDIR)/sources-stamp $(SDIR)/secured-stamp $(SDIR)/md5-check
 
 # Completely cleans the current arch tree
 realclean: distclean
-distclean: ok clean
-	$(Q)echo "Cleaning the build directory"
+distclean: ok bin-distclean src-distclean
+bin-distclean:
+	$(Q)echo "Cleaning the binary build directory"
+	$(Q)rm -rf $(BDIR)
 	$(Q)rm -rf $(ADIR)
-	$(Q)rm -rf $(TDIR)
+src-distclean:
+	$(Q)echo "Cleaning the source build directory"
+	$(Q)rm -rf $(SDIR)
 
-####################
 ## STATUS and APT ##
-####################
-
-$(CODENAME)_status: ok init
-	$(Q)for ARCH in $(ARCHES_NOSRC); do \
-		echo "Using the provided status file for $(CODENAME)-$$ARCH ..."; \
-		cp $(BASEDIR)/data/$(CODENAME)/status.$$ARCH $(ADIR)/$(CODENAME)-$$ARCH/status 2>/dev/null || $(MAKE) status || $(MAKE) correctstatus ; \
-	done
+
+# Some series (< xenial) don't have xz indices
+INDEX_EXTENSION=xz
+INDEX_DECOMPRESSOR=xzcat
+INDICES=$(wildcard $(MIRROR)/dists/$(CODENAME)*/*/binary-$(ARCH)/Packages.$(INDEX_EXTENSION))
+
+ifeq (,$(INDICES))
+INDEX_EXTENSION=gz
+INDEX_DECOMPRESSOR=zcat
+endif # $(INDICES)
+
+FIND_VERSION_FILENAME=$(shell $(INDEX_DECOMPRESSOR) $(MIRROR)/dists/$(CODENAME)$(1)/main/binary-$(ARCH)/Packages.$(INDEX_EXTENSION) | grep-dctrl -n -X -FPackage -sVersion,Filename $(ARCHIVE_KEYRING_PACKAGE))
+VERSION_GT=$(shell dpkg --compare-version $(1) gt $(2) && echo yes)
+
+ifeq (1,$(PROPOSED))
+PROPOSED_VERSION_FILENAME=$(call FIND_VERSION_FILENAME,-proposed)
+KEYRING_VERSION=$(firstword $(PROPOSED_VERSION_FILENAME))
+KEYRING_FILENAME=$(lastword $(PROPOSED_VERSION_FILENAME))
+endif # $(PROPOSED)
+
+ifeq (1,$(UPDATES))
+UPDATES_VERSION_FILENAME=$(call FIND_VERSION_FILENAME,-updates)
+UPDATES_VERSION=$(firstword $(UPDATES_VERSION_FILENAME))
+
+ifneq (,$(UPDATES_VERSION))
+ifneq (,$(KEYRING_VERSION))
+ifeq (yes,$(call VERSION_GT,$(UPDATES_VERSION),$(KEYRING_VERSION)))
+KEYRING_VERSION=$(UPDATES_VERSION)
+KEYRING_FILENAME=$(lastword $(UPDATES_VERSION_FILENAME))
+endif # $(VERSION_GT)
+else # $(KEYRING_VERSION)
+KEYRING_VERSION=$(UPDATES_VERSION)
+KEYRING_FILENAME=$(lastword $(UPDATES_VERSION_FILENAME))
+endif # $(KEYRING_VERSION)
+endif # $(UPDATES_VERSION)
+
+endif # $(UPDATES)
+
+# SECURITY isn't a bool, it's a string pointing to the security mirror
+ifneq (,$(SECURITY))
+SECURITY_VERSION_FILENAME=$(call FIND_VERSION_FILENAME,-security)
+SECURITY_VERSION=$(firstword $(SECURITY_VERSION_FILENAME))
+
+ifneq (,$(SECURITY_VERSION))
+ifneq (,$(KEYRING_VERSION))
+ifeq (yes,$(call VERSION_GT,$(SECURITY_VERSION),$(KEYRING_VERSION)))
+KEYRING_VERSION=$(SECURITY_VERSION)
+KEYRING_FILENAME=$(lastword $(SECURITY_VERSION_FILENAME))
+endif # $(VERSION_GT)
+else # $(KEYRING_VERSION)
+KEYRING_VERSION=$(SECURITY_VERSION)
+KEYRING_FILENAME=$(lastword $(SECURITY_VERSION_FILENAME))
+endif # $(KEYRING_VERSION)
+endif # $(SECURITY_VERSION)
+
+endif # $(SECURITY)
+
+# We don't have a -security, -proposed or -updates keyring. Use the one in release.
+ifeq ($(KEYRING_FILENAME),)
+KEYRING_FILENAME=$(lastword $(call FIND_VERSION_FILENAME))
+endif # $(KEYRING_FILENAME)
 
 # Regenerate the status file with only packages that
 # are of priority standard or higher
 status: init $(ADIR)/status
 $(ADIR)/status:
 	@echo "Generating a fake status file for apt-get and apt-cache..."
-	$(Q)for ARCH in $(ARCHES); do \
-		mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/preferences.d; \
-		if [ $$ARCH = "source" -o "$(INSTALLER_CD)" = "1" -o "$(INSTALLER_CD)" = "2" -o "$(INSTALLER_CD)" = "C" ];then \
-			:> $(ADIR)/$(CODENAME)-$$ARCH/status ; \
-		else \
-			zcat $(MIRROR)/dists/$(CODENAME)/main/binary-$$ARCH/Packages.gz | \
-			perl -000 -ne 's/^(Package: .*)$$/$$1\nStatus: install ok installed/m; print if (/^Priority: (required|important|standard)/m or /^Section: base/m);' \
-			>> $(ADIR)/$(CODENAME)-$$ARCH/status ; \
-		fi; \
-	done;
 	:> $(ADIR)/status
-
-	# Set up keyring so apt doesn't complain
 	@echo "Setting up archive-keyring"
 	$(Q)mkdir -p $(TDIR)/archive-keyring
-	$(Q)dpkg -x $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) $(ARCHIVE_KEYRING_PACKAGE)) $(TDIR)/archive-keyring
-	$(Q)for ARCH in $(ARCHES); do \
-		mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \
-		ln -s $(TDIR)/archive-keyring/$(ARCHIVE_KEYRING_FILE) $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \
-	done
-
+	@echo "Will extract $(MIRROR)/$(KEYRING_FILENAME) to $(TDIR)/archive-keyring"
+	$(Q)dpkg -x $(MIRROR)/$(KEYRING_FILENAME) $(TDIR)/archive-keyring
+	$(Q)mkdir -p $(ADIR)/apt/trusted.gpg.d
+	$(Q)for file in $(TDIR)/archive-keyring/etc/apt/trusted.gpg.d/*; do \
+		if [ -e $$file ]; then \
+			ln -s $$file $(ADIR)/apt/trusted.gpg.d/$$(basename $$file); \
+		fi; \
+	done
+	$(Q)for file in $(TDIR)/archive-keyring/usr/share/keyrings/*; do \
+		if [ -e $$file ] && ! [ -e $(ADIR)/apt/trusted.gpg.d/$$(basename $$file) ]; then \
+			ln -s $$file $(ADIR)/apt/trusted.gpg.d/$$(basename $$file); \
+		fi; \
+	done
 	# Updating the apt database
-	$(Q)for ARCH in $(ARCHES); do \
-		export ARCH=$$ARCH; \
-		$(apt) update; \
-	done
-
-	# If we're doing a build using d-i from sid, we'll need sid sources too
-	if [ "$(INC_SOURCE)"x = "yes"x ] && \
-		[ "$(DI_CODENAME)"x != ""x ] && \
-		[ "$(DI_CODENAME)"x != "$(CODENAME)"x ] ; then \
-		mkdir -p $(ADIR)/$(DI_CODENAME)-source/apt/preferences.d ; \
-		:> $(ADIR)/$(DI_CODENAME)-source/status ; \
-		export CODENAME=$(DI_CODENAME); \
-		export ARCH=source; \
-		$(apt) update; \
-	fi
-    #
-    # Checking the consistency of the standard system
-    # If this does fail, then launch make correctstatus
-    #
-	$(Q)for ARCH in $(ARCHES); do \
-		export ARCH=$$ARCH; \
-		$(apt) check || $(MAKE) correctstatus; \
-	done
+	$(Q)$(apt) update
+	#
+	# Checking the consistence of the standard system
+	# If this does fail, then launch make correctstatus
+	#
+	$(Q)$(apt) check || $(MAKE) correctstatus
 
 # Only useful if the standard system is broken
 # It tries to build a better status file with apt-get -f install
 correctstatus: status apt-update
-    # You may need to launch correctstatus more than one time
-    # in order to correct all dependencies
-    #
-    # Removing packages from the system :
-	$(Q)set -e; \
-	if [ "$(ARCHES)" != "source" ] ; then \
-		for ARCH in $(ARCHES_NOSRC); do \
-			export ARCH=$$ARCH; \
-			for i in `$(apt) deselected -f install`; do \
-				echo $$ARCH:$$i; \
-				perl -i -000 -ne "print unless /^Package: \Q$$i\E/m" \
-				$(ADIR)/$(CODENAME)-$$ARCH/status; \
-			done; \
-		done; \
-    fi
-    #
-    # Adding packages to the system :
-	$(Q)set -e; \
-	if [ "$(ARCHES)" != "source" ] ; then \
-		for ARCH in $(ARCHES_NOSRC); do \
-			export ARCH=$$ARCH; \
-			for i in `$(apt) selected -f install`; do \
-				echo $$ARCH:$$i; \
-				$(apt) cache dumpavail | perl -000 -ne \
-				"s/^(Package: .*)\$$/\$$1\nStatus: install ok installed/m; \
-				print if /^Package: \Q$$i\E\s*\$$/m;" \
-				>> $(ADIR)/$(CODENAME)-$$ARCH/status; \
-			done; \
-		done; \
-    fi
-    #
-    # Showing the output of apt-get check :
-	$(Q)for ARCH in $(ARCHES_NOSRC); do \
-		ARCH=$$ARCH $(apt) check; \
-	done
+	# You may need to launch correctstatus more than one time
+	# in order to correct all dependencies
+	#
+	# Removing packages from the system :
+	$(Q)set -e; \
+	for i in `$(apt) deselected -f install`; do \
+		echo $$i; \
+		perl -i -000 -ne "print unless /^Package: \Q$$i\E/m" \
+		$(ADIR)/status; \
+	done
+	#
+	# Adding packages to the system :
+	$(Q)set -e; \
+	for i in `$(apt) selected -f install`; do \
+	  echo $$i; \
+	  $(apt) cache dumpavail | perl -000 -ne \
+	      "s/^(Package: .*)\$$/\$$1\nStatus: install ok installed/m; \
+	       print if /^Package: \Q$$i\E\s*\$$/m;" \
+	       >> $(ADIR)/status; \
+	done
+	#
+	# Showing the output of apt-get check :
+	$(Q)$(apt) check
 
 apt-update: status
-	$(Q)if [ "$(ARCHES)" != "source" ] ; then \
-		for ARCH in $(ARCHES); do \
-			echo "Apt-get is updating its files ..."; \
-			ARCH=$$ARCH $(apt) update; \
-		done; \
-    fi
+	@echo "Apt-get is updating his files ..."
+	$(Q)$(apt) update
+
 
 ## GENERATING LISTS ##
 
 # Deleting the list only
 deletelist: ok
 	$(Q)-rm $(BDIR)/rawlist
+	$(Q)-rm $(BDIR)/rawlist-exclude
 	$(Q)-rm $(BDIR)/list
-
-packagelists: ok apt-update genlist
-
-# Build the raw list (cpp output) with doubles and spaces
-$(BDIR)/rawlist:
-# Dirty workaround for saving space, we add some hints to break ties.
-# This is just a temporal solution, sort_deps should be a little bit less
-# silly so that this is not needed. For more info have a look at
-# http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
-	$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
-		if [ "$(INSTALLER_CD)"x = "1"x ] ; then \
-			: ; \
-		elif [ "$(INSTALLER_CD)"x = "2"x -o "$(INSTALLER_CD)"x = "C"x ] ; then \
-			echo "mawk" >>$(BDIR)/rawlist; \
-		else \
-			echo "mawk" >>$(BDIR)/rawlist; \
-			echo "exim4-daemon-light" >>$(BDIR)/rawlist; \
-		fi; \
-	fi
-
-	$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
-		if [ _$(INSTALLER_CD) != _1 ]; then \
-			for ARCH in $(ARCHES_NOSRC); do \
-				BINCLUDE=`[ -n "$(BASE_INCLUDE)" ] && cat $(BASE_INCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \
-				[ -z "$$BINCLUDE" ] || BINCLUDE="--include=$$BINCLUDE"; \
-				BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \
-				[ -z "$$BEXCLUDE" ] || BEXCLUDE="--exclude=$$BEXCLUDE"; \
-				debootstrap $(DEBOOTSTRAP_OPTS) --arch $$ARCH \
-				            --print-debs \
-				            $$BINCLUDE $$BEXCLUDE \
-				            $(CODENAME) \
-				            $(TDIR)/debootstrap.tmp \
-				            file:$(MIRROR) \
-			                $(DEBOOTSTRAP_SCRIPT) 2>/dev/null \
-				    | tr ' ' '\n' > $(BDIR)/debootstrap-list; \
-				cat $(BDIR)/debootstrap-list >>$(BDIR)/rawlist; \
-				rm -rf $(TDIR)/debootstrap.tmp; \
-			done; \
-		fi; \
-	fi
-
-	$(Q)for ARCH in $(ARCHES_NOSRC); do \
-		ARCHDEFS="$$ARCHDEFS -D ARCH_`echo $$ARCH | sed 's/-/_/'`"; \
-		ARCHUNDEFS="$$ARCHUNDEFS -U $$ARCH"; \
-	done; \
-	for VARIANT in $(VARIANTS); do \
-		VARIANTDEFS="$$VARIANTDEFS -D VARIANT_$$VARIANT"; \
-	done; \
-	if [ "$(FORCE_FIRMWARE)"x = "1"x ] ; then \
-		ARCHDEFS="$$ARCHDEFS -DFORCE_FIRMWARE"; \
-	fi; \
-	if [ "$(EXCLUDE_486_KERNEL)"x = "1"x ] ; then \
-		ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_486_KERNEL"; \
-	fi; \
-	if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
-		cat $(TASKDIR)/$(TASK) | \
-		cpp -nostdinc -P -undef $$ARCHDEFS $$VARIANTDEFS\
-	   		$$ARCHUNDEFS -U i386 -U linux -U unix \
-		    -DFORCENONUSONCD1=0 \
-		    -I $(TASKDIR) - - >> $(BDIR)/rawlist; \
-	fi
-
-    # If we're *only* doing source, then we need to build a list of all the
-    # available source packages. Deliberately ignore the tasks too.
-	$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
-		awk '/^Package:/ {print $$2}' $(ADIR)/$(CODENAME)-source/apt-state/lists/*Sources | \
-			sort -u > $(BDIR)/rawlist; \
-	fi
-#	ls -al $(BDIR)/rawlist
+	$(Q)-rm $(BDIR)/list.exclude
+
+# Generates the list of packages/files to put on each CD
+list: bin-list src-list
+
+# Generate the listing of binary packages
+bin-list: ok apt-update bin-genlist $(BDIR)/1.packages
+$(BDIR)/1.packages:
+	@echo "Dispatching the packages on all the CDs ..."
+	$(Q)$(list2cds) $(BDIR)/list $(SIZELIMIT)
+ifdef FORCENONUSONCD1
+	$(Q)set -e; \
+	 for file in $(BDIR)/*.packages; do \
+	    newfile=$${file%%.packages}_NONUS.packages; \
+	    cp $$file $$newfile; \
+	    $(strip_nonus_bin) $$file $$file.tmp; \
+	    if (cmp -s $$file $$file.tmp) ; then \
+	        rm -f $$file.tmp $$newfile ; \
+	    else \
+	        echo Splitting non-US packages: $$file and $$newfile ; \
+	        mv -f $$file.tmp $$file; \
+	    fi ;\
+	done
+endif
+
+# Generate the listing for sources CDs corresponding to the packages included
+# in the binary set
+src-list: ok apt-update src-genlist $(SDIR)/1.sources
+$(SDIR)/1.sources:
+	@echo "Dispatching the sources on all the CDs ..."
+	$(Q)$(list2src) $(SDIR)/list $(SIZELIMIT)
+ifdef FORCENONUSONCD1
+	$(Q)set -e; \
+	 for file in $(SDIR)/*.sources; do \
+	    newfile=$${file%%.sources}_NONUS.sources; \
+	    cp $$file $$newfile; \
+	    grep -v non-US $$file >$$file.tmp; \
+	    if (cmp -s $$file $$file.tmp) ; then \
+	        rm -f $$file.tmp $$newfile ; \
+	    else \
+	        echo Splitting non-US sources: $$file and $$newfile ; \
+	        mv -f $$file.tmp $$file; \
+	    fi ;\
+	done
+endif
 
 # Generate the complete listing of packages from the task
 # Build a nice list without doubles and without spaces
-genlist: ok $(BDIR)/list
+bin-genlist: ok $(BDIR)/list $(BDIR)/list.exclude
 $(BDIR)/list: $(BDIR)/rawlist
-	@echo "Generating the complete list of packages to be included in $(BDIR)/list..."
+	@echo "Generating the complete list of packages to be included ..."
 	$(Q)perl -ne 'chomp; next if /^\s*$$/; \
 	          print "$$_\n" if not $$seen{$$_}; $$seen{$$_}++;' \
 		  $(BDIR)/rawlist \
 		  > $(BDIR)/list
 
+
+$(BDIR)/list.exclude: $(BDIR)/rawlist-exclude
+	@echo "Generating the complete list of packages to be removed ..."
+	$(Q)perl -ne 'chomp; next if /^\s*$$/; \
+	          print "$$_\n" if not $$seen{$$_}; $$seen{$$_}++;' \
+		  $(BDIR)/rawlist-exclude \
+		  > $(BDIR)/list.exclude
+
+# Build the raw list (cpp output) with doubles and spaces
+$(BDIR)/rawlist:
+ifdef FORCENONUSONCD1
+	$(Q)$(apt) cache dumpavail | \
+		grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us)' - | \
+		sort | uniq > $(BDIR)/$(CAPPROJECT)_$(CODENAME)_nonUS
+endif
+	$(Q)if [ -x "/usr/sbin/debootstrap" -a _$(INSTALLER_CD) != _1 -a _$(CDIMAGE_SQUASHFS_BASE) != _1 ]; then \
+		mkdir -p $(DEBOOTSTRAP)/tmp-$(ARCH) ; \
+		$(DEBOOTSTRAPROOT) /usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME) $(DEBOOTSTRAP)/tmp-$(ARCH) file://$(MIRROR) $(DEBOOTSTRAP)/$(CODENAME)-$(FULLARCH) \
+		| tr ' ' '\n' >>$(BDIR)/rawlist.debootstrap; \
+	fi
+	$(Q)perl -npe 's/\@ARCH\@/$(FULLARCH)/g' $(TASK) | \
+	 cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(FULLARCH) -D ARCH_$(subst -,_,$(subst +,_,$(FULLARCH))) \
+	     -U $(ARCH) -U i386 -U linux -U unix \
+	     -DFORCENONUSONCD1=$(forcenonusoncd1) \
+	     -I $(BASEDIR)/tasks/auto/$(IMAGE_TYPE) -I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist
+
+# Build the raw list (cpp output) with doubles and spaces for excluded packages
+$(BDIR)/rawlist-exclude:
+	$(Q)if [ -n "$(EXCLUDE)" ]; then \
+	 	perl -npe 's/\@ARCH\@/$(FULLARCH)/g' $(EXCLUDE) | \
+			cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(FULLARCH) -D ARCH_$(subst -,_,$(subst +,_,$(FULLARCH))) \
+				-U $(ARCH) -U i386 -U linux -U unix \
+	     			-DFORCENONUSONCD1=$(forcenonusoncd1) \
+	     			-I $(BASEDIR)/tasks/auto/$(IMAGE_TYPE) -I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist-exclude; \
+	else \
+		echo > $(BDIR)/rawlist-exclude; \
+	fi
+
+# Generate the complete listing of sources from the task
+# Build a nice list without doubles and without spaces
+# TODO: no exclude support; does it matter?
+src-genlist: ok $(SDIR)/list
+$(SDIR)/list: $(SDIR)/rawlist
+	@echo "Generating the complete list of packages to be included ..."
+	$(Q)perl -ne 'chomp; next if /^\s*$$/; \
+	          print "$$_\n" if not $$seen{$$_}; $$seen{$$_}++;' \
+		  $(SDIR)/rawlist \
+		  > $(SDIR)/list
+
+$(SDIR)/rawlist:
+	$(Q)($(foreach arch,$(ARCHES), \
+	perl -npe 's/\@ARCH\@/$(arch)/g' $(TASK) | \
+	 cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(arch) -D ARCH_$(subst -,_,$(subst +,_,$(arch))) \
+	     -U $(arch) -U i386 -U linux -U unix \
+	     -DFORCENONUSONCD1=$(forcenonusoncd1) \
+	     -I $(BASEDIR)/tasks/auto/$(IMAGE_TYPE) -I $(BASEDIR)/tasks -I $(SDIR) - -; \
+	)) | sort | uniq > $(SDIR)/rawlist
+
+## DIRECTORIES && PACKAGES && INFOS ##
+
+# Create all the needed directories for installing packages (plus the
+# .disk directory)
+tree: bin-tree src-tree
+bin-tree: ok bin-list $(BDIR)/CD1/ubuntu
+$(BDIR)/CD1/ubuntu:
+	@echo "Adding the required directories to the binary CDs ..."
+	$(Q)set -e; \
+	 for i in $(BDIR)/*.packages; do \
+		dir=$${i%%.packages}; \
+		dir=$${dir##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$dir; \
+		mkdir -p $$dir; \
+		$(add_dirs) $$dir; \
+	done
+
+src-tree: ok src-list $(SDIR)/CD1/ubuntu
+$(SDIR)/CD1/ubuntu:
+	@echo "Adding the required directories to the source CDs ..."
+	$(Q)set -e; \
+	 for i in $(SDIR)/*.sources; do \
+		dir=$${i%%.sources}; \
+		dir=$${dir##$(SDIR)/}; \
+		dir=$(SDIR)/CD$$dir; \
+		mkdir -p $$dir; \
+		$(add_dirs) $$dir; \
+	done
+
+# CD labels / volume ids / disk info
+infos: bin-infos src-infos
+bin-infos: bin-tree $(BDIR)/CD1/.disk/info
+$(BDIR)/CD1/.disk/info:
+	@echo "Generating the binary CD labels and their volume ids ..."
+	$(Q)set -e; \
+	 nb=`find $(BDIR) -name \*.packages | grep '^..?\.packages$$' | wc -l | tr -d " "`; num=0;\
+	 DATE=$${CDIMAGE_DATE:-`date +%Y%m%d`}; \
+	for i in $(BDIR)/*.packages; do \
+		num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$num; \
+		echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
+		echo -n $(BINVOLID) > $(BDIR)/$${num}.volid; \
+		$(set_mkisofs_opts) bin $$num > $(BDIR)/$${num}.mkisofs_opts; \
+	done
+src-infos: src-tree $(SDIR)/CD1/.disk/info
+$(SDIR)/CD1/.disk/info:
+	@echo "Generating the source CD labels and their volume ids ..."
+	$(Q)set -e; \
+	 nb=`find $(SDIR) -name \*.sources | grep '^..?\.sources$$'  | wc -l | tr -d " "`; num=0;\
+	 DATE=$${CDIMAGE_DATE:-`date +%Y%m%d`}; \
+	for i in $(SDIR)/*.sources; do \
+		num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
+		dir=$(SDIR)/CD$$num; \
+		echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
+		echo -n $(SRCVOLID) > $(SDIR)/$${num}.volid; \
+		$(set_mkisofs_opts) src $$num > $(SDIR)/$${num}.mkisofs_opts; \
+	done
+
+# Adding the deb files to the images
+packages: bin-infos bin-list $(BDIR)/packages-stamp
+$(BDIR)/packages-stamp:
+	@echo "Current disk usage on the binary CDs (before the debs are added) :"
+	@cd $(BDIR) && du -sm CD[0123456789]*
+	@echo "Adding the selected packages to each CD :"
+ifeq ($(CDIMAGE_INSTALL_BASE),1)
+ifneq ($(CDIMAGE_ADDON),1)
+ifneq ($(CDIMAGE_SQUASHFS_BASE),1)
+	@# Check that all packages required by debootstrap are included
+	@# and create .disk/base_installable if yes
+	@# Also create .disk/base_components
+	$(Q)for DISK in $(FIRSTDISKS); do \
+	    DISK=$${DISK##CD}; \
+	    if [ -x "/usr/sbin/debootstrap" ]; then \
+	        ok=yes; \
+		mkdir -p $(DEBOOTSTRAP)/tmp-$(ARCH) ; \
+	        for p in `$(DEBOOTSTRAPROOT) /usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME) $(DEBOOTSTRAP)/tmp-$(ARCH) file://$(MIRROR) $(DEBOOTSTRAP)/$(CODENAME)-$(FULLARCH)`; do \
+		    if ! grep -q ^$$p$$ $(BDIR)/$$DISK.packages; then \
+			if [ -n "$(BASE_EXCLUDE)" ] && grep -q ^$$p$$ $(BASE_EXCLUDE); then \
+				echo "Missing debootstrap-required $$p but included in $(BASE_EXCLUDE)"; \
+				continue; \
+			fi; \
+		        ok=no; \
+		        echo "Missing debootstrap-required $$p"; \
+		    fi; \
+	        done; \
+	        if [ "$$ok" = "yes" ]; then \
+		    echo "CD$$DISK contains all packages needed by debootstrap"; \
+		    touch $(BDIR)/CD$$DISK/.disk/base_installable; \
+	        else \
+		    echo "CD$$DISK missing some packages needed by debootstrap"; \
+		    exit 1; \
+	        fi; \
+	    else \
+	        echo "Unable to find debootstrap program"; \
+	    fi; \
+	    echo 'main' > $(BDIR)/CD$$DISK/.disk/base_components; \
+	    if [ "$$RESTRICTED" = 1 ]; then \
+		echo 'restricted' >> $(BDIR)/CD$$DISK/.disk/base_components; \
+	    fi; \
+	    if [ "$$UNIVERSE" = 1 ]; then \
+		echo 'universe' >> $(BDIR)/CD$$DISK/.disk/base_components; \
+	    fi; \
+	    if [ "$$MULTIVERSE" = 1 ]; then \
+		echo 'multiverse' >> $(BDIR)/CD$$DISK/.disk/base_components; \
+	    fi; \
+	    if [ "$$CDIMAGE_DVD" = 1 ]; then \
+	    	echo 'dvd/single' > $(BDIR)/CD$$DISK/.disk/cd_type; \
+	    else \
+	        echo 'full_cd/single' > $(BDIR)/CD$$DISK/.disk/cd_type; \
+	    fi; \
+	    if [ -n "$(UDEB_INCLUDE)" ] ; then \
+		if [ -r "$(UDEB_INCLUDE)" ] ; then \
+		    cp -af "$(UDEB_INCLUDE)" \
+		        "$(BDIR)/CD$$DISK/.disk/udeb_include"; \
+		else \
+		    echo "ERROR: Unable to read UDEB_INCLUDE file $(UDEB_INCLUDE)"; \
+		fi; \
+	    fi; \
+	    if [ -n "$(UDEB_EXCLUDE)" ] ; then \
+		if [ -r "$(UDEB_EXCLUDE)" ] ; then \
+		    cp -af "$(UDEB_EXCLUDE)" \
+		        "$(BDIR)/CD$$DISK/.disk/udeb_exclude"; \
+		else \
+		    echo "ERROR: Unable to read UDEB_EXCLUDE file $(UDEB_EXCLUDE)"; \
+		fi; \
+	    fi; \
+	    if [ -n "$(BASE_INCLUDE)" ] ; then \
+		if [ -r "$(BASE_INCLUDE)" ] ; then \
+		    cp -af "$(BASE_INCLUDE)" \
+		        "$(BDIR)/CD$$DISK/.disk/base_include"; \
+		else \
+		    echo "ERROR: Unable to read BASE_INCLUDE file $(BASE_INCLUDE)"; \
+		fi; \
+	    fi; \
+	    if [ -n "$(BASE_EXCLUDE)" ] ; then \
+		if [ -r "$(BASE_EXCLUDE)" ] ; then \
+		    cp -af $(BASE_EXCLUDE) \
+			$(BDIR)/CD$$DISK/.disk/base_exclude; \
+		else \
+		    echo "ERROR: Unable to read BASE_EXCLUDE file $(BASE_EXCLUDE)"; \
+		fi; \
+	    fi; \
+	done
+endif
+endif
+endif
+ifeq ($(LIVE_FILESYSTEM),1)
+	@# Ubuntu live CDs are installable too
+	touch $(BDIR)/CD1/.disk/base_installable
+	if [ "$$CDIMAGE_DVD" = 1 ]; then \
+	    echo 'dvd/single' > $(BDIR)/CD1/.disk/cd_type; \
+	else \
+	    echo 'full_cd/single' > $(BDIR)/CD1/.disk/cd_type; \
+	fi
+endif
+	@# This is a terrible hack to get extra packages into the pool:
+	$(Q)set -e; \
+	 if [ -f "$(BASEDIR)/data/$(DI_CODENAME)/$(PROJECT)-pool-$(ARCH).packages" ]; then \
+	     cat $(BASEDIR)/data/$(DI_CODENAME)/$(PROJECT)-pool-$(ARCH).packages \
+	         >> $(BDIR)/1.packages; \
+	 fi
+	$(Q)set -e; \
+	 for i in $(BDIR)/*.packages; do \
+		dir=$${i%%.packages}; \
+		n=$${dir##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$n; \
+		echo "$$n ... "; \
+	  	grep -v '^#' $$i | xargs -n 200 -r $(add_packages) $$dir; \
+		if [ -x "$(HOOK)" ]; then \
+		   cd $(BDIR) && $(HOOK) $$n before-scanpackages; \
+		fi; \
+		$(scanpackages) scan $$dir; \
+		echo "done."; \
+	done
+	@#Now install the Packages and Packages.cd files
+	$(Q)set -e; \
+	 for i in $(BDIR)/*.packages; do \
+		dir=$${i%%.packages}; \
+		dir=$${dir##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$dir; \
+		$(scanpackages) install $$dir; \
+	done
+ifeq ($(LIVE_FILESYSTEM),1)
+	$(Q)$(add_live_filesystem)
+endif
+ifeq ($(CDIMAGE_LIVE),1)
+	$(Q)$(add_winfoss)
+endif
+	$(Q)touch $(BDIR)/packages-stamp
+
+sources: src-infos src-list $(SDIR)/sources-stamp
+$(SDIR)/sources-stamp:
+	@echo "Adding the selected sources to each CD."
+	$(Q)set -e; \
+	 for i in $(SDIR)/*.sources; do \
+		dir=$${i%%.sources}; \
+		n=$${dir##$(SDIR)/}; \
+		dir=$(SDIR)/CD$$n; \
+		echo -n "$$n ... "; \
+		echo -n "main ... "; \
+		grep -vE "(non-US/|/local/)" $$i > $$i.main || true ; \
+		if [ -s $$i.main ] ; then \
+			cat $$i.main | xargs $(add_files) $$dir $(MIRROR); \
+		fi ; \
+		if [ -n "$(LOCAL)" ]; then \
+			echo -n "local ... "; \
+			grep "/local/" $$i > $$i.local || true ; \
+			if [ -s $$i.local ] ; then \
+				if [ -n "$(LOCALDEBS)" ] ; then \
+					cat $$i.local | xargs $(add_files) \
+						$$dir $(LOCALDEBS); \
+			    else \
+					cat $$i.local | xargs $(add_files) \
+						$$dir $(MIRROR); \
+				fi; \
+		    fi; \
+		fi; \
+		if [ -n "$(NONUS)" ]; then \
+			echo -n "non-US ... "; \
+			grep "non-US/" $$i > $$i.nonus || true ; \
+			if [ -s $$i.nonus ] ; then \
+				cat $$i.nonus | xargs $(add_files) $$dir $(NONUS); \
+			fi; \
+		fi; \
+		$(scansources) $$dir; \
+		echo "done."; \
+	done
+	$(Q)touch $(SDIR)/sources-stamp
+
+## BOOT & DOC & INSTALL ##
+
+# Basic checks
+$(MIRROR)/doc: need-complete-mirror
+$(MIRROR)/tools: need-complete-mirror
+need-complete-mirror:
+	# now a no-op
+
+# Add everything that is needed to make the CDs bootable
+bootable: ok disks installtools packages $(BDIR)/bootable-stamp
+$(BDIR)/bootable-stamp:
+	@echo "Making the binary CDs bootable ..."
+	$(Q)set -e; \
+	 for file in $(BDIR)/*.packages; do \
+		dir=$${file%%.packages}; \
+		n=$${dir##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$n; \
+		if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) ]; then \
+		    cd $(BDIR); \
+		    echo "Running tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) $$n $$dir" ; \
+		    $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) $$n $$dir; \
+		elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) ]; then \
+		    cd $(BDIR); \
+		    echo "Running tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir" ; \
+		    $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir; \
+		else \
+		    if [ "$${IGNORE_MISSING_BOOT_SCRIPT:-0}" = "0" ]; then \
+			echo "No script to make CDs bootable for $(FULLARCH) ..."; \
+			exit 1; \
+		    fi; \
+		fi; \
+	done
+	$(Q)touch $(BDIR)/bootable-stamp
+
+# Add the install stuff on the first CD
+installtools: ok bin-infos disks $(BDIR)/CD1/install
+$(BDIR)/CD1/install:
+	@echo "Adding install tools and documentation ..."
+	$(Q)set -e; \
+	 for DISK in $(FIRSTDISKS) ; do \
+		mkdir $(BDIR)/$$DISK/install ; \
+		if [ -x "$(BASEDIR)/tools/$(CODENAME)/installtools.sh" ]; then \
+			$(BASEDIR)/tools/$(CODENAME)/installtools.sh $(BDIR)/$$DISK ; \
+		fi ; \
+	done
+
+ifeq (,$(findstring serveraddon,$(call CDBASE,2)))
+ifeq ($(CDIMAGE_ADDON),1)
+app-install: ok packages $(BDIR)/CD1/app-install
+$(BDIR)/CD1/app-install:
+	@echo "Adding app-install data ..."
+	$(Q)set -e; \
+	if [ -x "$(BASEDIR)/tools/$(CODENAME)/app-install.sh" ]; then \
+		$(BASEDIR)/tools/$(CODENAME)/app-install.sh 1 $(BDIR)/CD1; \
+	fi
+else
+app-install:
+endif
+else
+app-install: ok packages $(BDIR)/CD2/app-install
+$(BDIR)/CD2/app-install:
+	@echo "Adding app-install data ..."
+	$(Q)set -e; \
+	if [ -x "$(BASEDIR)/tools/$(CODENAME)/app-install.sh" ]; then \
+		$(BASEDIR)/tools/$(CODENAME)/app-install.sh 2 $(BDIR)/CD2; \
+	fi
+endif
+
+# Add the disks-arch directories if/where needed
+disks: ok bin-infos $(BDIR)/CD1/dists/$(DI_CODENAME)/main/disks-$(ARCH)
+$(BDIR)/CD1/dists/$(DI_CODENAME)/main/disks-$(ARCH):
+ifdef BOOTDISKS
+	@echo "Adding disks-$(ARCH) stuff ..."
+	$(Q)set -e; \
+	 for DISK in $(FIRSTDISKS) ; do \
+		mkdir -p $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH) ; \
+		$(add_files) \
+		  $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH) \
+		  $(BOOTDISKS) . ; \
+		touch $(BDIR)/$$DISK/.disk/kernel_installable ; \
+		cd $(BDIR)/$$DISK/dists/$(DI_CODENAME)/main/disks-$(ARCH); \
+		rm -rf base-images-*; \
+		if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \
+		if [ -L current ]; then \
+			CURRENT_LINK=`readlink current`; \
+			mv $$CURRENT_LINK .tmp_link; \
+			rm -rf [0123456789]*; \
+			mv .tmp_link $$CURRENT_LINK; \
+		elif [ -d current ]; then \
+			rm -rf [0123456789]*; \
+		fi; \
+	done
+endif
+
+ifneq ($(CDIMAGE_INSTALL_BASE),1)
+upgrade:
+else ifeq ($(CDIMAGE_SQUASHFS_BASE),1)
+upgrade:
+else
+upgrade: ok bin-infos $(BDIR)/upgrade-stamp
+$(BDIR)/upgrade-stamp:
+	@echo "Trying to add upgrade* directories ..."
+	$(Q)if [ -x "$(BASEDIR)/tools/$(CODENAME)/upgrade.sh" ]; then \
+		$(BASEDIR)/tools/$(CODENAME)/upgrade.sh $(BDIR); \
+	 fi
+	$(Q)if [ -x "$(BASEDIR)/tools/$(CODENAME)/upgrade-$(ARCH).sh" ]; then \
+		$(BASEDIR)/tools/$(CODENAME)/upgrade-$(ARCH).sh $(BDIR); \
+	 fi
+	$(Q)touch $(BDIR)/upgrade-stamp
+endif
+
+## EXTRAS ##
+
+# Launch the extras scripts correctly for customizing the CDs
+extras: bin-extras
+bin-extras: ok
+	$(Q)if [ -z "$(DIR)" -o -z "$(CD)" -o -z "$(ROOTSRC)" ]; then \
+	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
+	  false; \
+	fi
+	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(BDIR)/CD$(CD)'" ...
+	$(Q)$(add_files) $(BDIR)/CD$(CD) $(ROOTSRC) $(DIR)
+src-extras:
+	$(Q)if [ -z "$(DIR)" -o -z "$(CD)" -o -z "$(ROOTSRC)" ]; then \
+	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
+	  false; \
+	fi
+	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(SDIR)/CD$(CD)'" ...
+	$(Q)$(add_files) $(SDIR)/CD$(CD) $(ROOTSRC) $(DIR)
+
 ## IMAGE BUILDING ##
 
-image-trees: ok genlist
-    # Use sort_deps to do the dependency sorting
-	$(Q)for ARCH in $(ARCHES_NOSRC); do \
-		ARCH=$$ARCH $(sort_deps) $(BDIR)/list; \
-	done
-	$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
-		$(grab_source_list) $(BDIR) $(ADIR) $(BDIR)/list $(BDIR)/packages; \
-	else \
-		$(merge_package_lists) $(BDIR) $(ADIR) "$(ARCHES)" $(BDIR)/packages; \
-	fi
-	$(Q)if [ "$(INC_SOURCE)"x = "yes"x ] ; then \
-		grep ^source $(BDIR)/packages > $(BDIR)/packages.source; \
-	fi
-	$(Q)$(BASEDIR)/tools/make_disc_trees.pl $(BASEDIR) $(MIRROR) $(TDIR) $(CODENAME) "$(ARCHES)" "$(MKISOFS)" "$(MKISOFS_OPTS) $(JIGDO_OPTS)"
-
-images: ok $(OUT) $(BDIR)/md5-check
-	$(Q)$(make_image) "$(BDIR)" "$(ARCHES)" "$(OUT)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"
-
-check-number-given:
-	@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
+# Get some size info about the build dirs
+imagesinfo: bin-imagesinfo
+bin-imagesinfo: ok
+	$(Q)for i in $(BDIR)/*.packages; do \
+		echo `du -sb $${i%%.packages}`; \
+	done
+src-imagesinfo: ok
+	$(Q)for i in $(SDIR)/*.sources; do \
+		echo `du -sb $${i%%.sources}`; \
+	done
+
+# Generate a md5sum.txt file listings all files on the CD
+md5list: bin-md5list src-md5list
+bin-md5list: ok packages bin-secured $(BDIR)/CD1/md5sum.txt
+$(BDIR)/CD1/md5sum.txt:
+	@echo "Generating md5sum of files from all the binary CDs ..."
+	$(Q)set -e; \
+	if [ "$$FASTSUMS" != "1" ] ; then \
+	 for file in $(BDIR)/*.packages; do \
+		dir=$${file%%.packages}; \
+		n=$${dir##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$n; \
+		test -x "$(HOOK)" && cd $(BDIR) && $(HOOK) $$n before-mkisofs; \
+		cd $$dir; \
+		find . -follow -type f -print0 | grep -zZ -v "\./md5sum" | \
+		grep -zZ -v "dists/stable" | grep -zZ -v "dists/frozen" | \
+		grep -zZ -v "dists/unstable" | \
+		xargs -0 $(md5sum) > md5sum.txt ; \
+	 done \
+	else \
+	 $(fastsums) $(BDIR); \
+	fi
+	$(Q)set -e; for dir in $(BDIR)/CD*; do \
+		[ -d "$$dir" ] || continue; \
+		$(hardlink) "$$dir"; \
+	done
+src-md5list: ok sources src-secured $(SDIR)/CD1/md5sum.txt
+$(SDIR)/CD1/md5sum.txt:
+	@echo "Generating md5sum of files from all the source CDs ..."
+	$(Q)set -e; \
+	if [ "$$FASTSUMS" != "1" ] ; then \
+	 for file in $(SDIR)/*.sources; do \
+		dir=$${file%%.sources}; \
+		dir=$${dir##$(SDIR)/}; \
+		dir=$(SDIR)/CD$$dir; \
+		cd $$dir; \
+		find . -follow -type f -print0 | grep -zZ -v "\./md5sum" | \
+		grep -zZ -v "dists/stable" | grep -zZ -v "dists/frozen" | \
+		grep -zZ -v "dists/unstable" | \
+		xargs -0 $(md5sum) > md5sum.txt ; \
+	 done \
+	else \
+	 $(fastsums) $(SDIR); \
+	fi
+	$(Q)set -e; for dir in $(BDIR)/CD*; do \
+		[ -d "$$dir" ] || continue; \
+		$(hardlink) "$$dir"; \
+	done
+
+
+# Generate $CODENAME-secured tree with Packages and Release(.gpg) files
+# from the official tree
+# Complete the Release file from the normal tree
+secured: bin-secured src-secured
+bin-secured: $(BDIR)/secured-stamp
+$(BDIR)/secured-stamp:
+	@echo "Generating $(CODENAME)-secured on all the binary CDs ..."
+	$(Q)set -e; \
+	 for file in $(BDIR)/*.packages; do \
+		dir=$${file%%.packages}; \
+		n=$${dir##$(BDIR)/}; \
+		dir=$(BDIR)/CD$$n; \
+		cd $$dir; \
+		$(add_secured); \
+	done
+	$(Q)touch $(BDIR)/secured-stamp
+
+src-secured: $(SDIR)/secured-stamp
+$(SDIR)/secured-stamp:
+	@echo "Generating $(CODENAME)-secured on all the source CDs ..."
+	$(Q)set -e; \
+	 for file in $(SDIR)/*.sources; do \
+		dir=$${file%%.sources}; \
+		dir=$${dir##$(SDIR)/}; \
+		dir=$(SDIR)/CD$$dir; \
+		cd $$dir; \
+		$(add_secured); \
+	done
+	$(Q)touch $(SDIR)/secured-stamp
+
+# Generates all the images
+images: bin-images src-images
+
+# DOJIGDO actions   (for both binaries and source)
+#    0    isofile
+#    1    isofile + jigdo, cleanup_jigdo
+#    2    jigdo, cleanup_jigdo
+#
+bin-images: ok bin-md5list $(OUT)
+	@echo "Generating the binary iso/jigdo images ..."
+	$(Q)set -e; \
+	 for file in $(BDIR)/*.packages; do \
+		dir=$${file%%.packages}; \
+		n=$${dir##$(BDIR)/}; \
+		num=$$n; \
+		dir=$(BDIR)/CD$$n; \
+		cd $$dir/..; \
+		opts=`cat $(BDIR)/$$n.mkisofs_opts`; \
+		volid=`cat $(BDIR)/$$n.volid`; \
+		rm -f $(OUT)/$(call CDBASE,$$n).raw; \
+		if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
+			if [ -d boot$$n/ ]; then \
+				cp -a boot$$n/* CD$$n; \
+			fi; \
+			$(make_vfat_img) -d CD$$n \
+			 -o $(OUT)/$(call CDBASE,$$n).raw; \
+		elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
+		if [ "$(DOJIGDO)" = "0" ]; then \
+			$(verbose) $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+			  -o $(OUT)/$(call CDBASE,$$n).raw $$opts CD$$n; \
+			chmod +r $(OUT)/$(call CDBASE,$$n).raw; \
+		elif [ "$(DOJIGDO)" = "1" ]; then \
+			$(verbose) $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+			  -o $(OUT)/$(call CDBASE,$$n).raw \
+			  -jigdo-jigdo $(OUT)/$(call CDBASE,$$n).jigdo \
+			  -jigdo-template $(OUT)/$(call CDBASE,$$n).template \
+			  -jigdo-map Debian=$(MIRROR)/ \
+			  -jigdo-exclude boot$$n \
+			  -md5-list $(BDIR)/md5-check \
+			  $(JIGDO_OPTS) $$opts CD$$n; \
+			chmod +r $(OUT)/$(call CDBASE,$$n).raw; \
+		elif [ "$(DOJIGDO)" = "2" ]; then \
+			$(verbose) $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+			  -o /dev/null -v \
+			  -jigdo-jigdo $(OUT)/$(call CDBASE,$$n).jigdo \
+			  -jigdo-template $(OUT)/$(call CDBASE,$$n).template \
+			  -jigdo-map Debian=$(MIRROR)/ \
+			  -jigdo-exclude boot$$n \
+			  -md5-list $(BDIR)/md5-check \
+			  $(JIGDO_OPTS) $$opts CD$$n; \
+		fi; \
+		if [ "$(DOJIGDO)" != "0" ]; then \
+			$(jigdo_cleanup) $(OUT)/$(call CDBASE,$$n).jigdo \
+				$(call CDBASE,$$n).iso $(BDIR)/CD$$n \
+				`echo "$(JIGDOTEMPLATEURL)" | sed -e 's|%ARCH%|$(FULLARCH)|g'`"$(call CDBASE,$$n).template" \
+				$(BINDISKINFOND) \
+				$(JIGDOFALLBACKURLS) ; \
+		fi; \
+		fi; \
+		if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) ]; then \
+			$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) $$n $(BDIR)/CD$$n \
+			$(OUT)/$(call CDBASE,$$n).raw; \
+		elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
+			$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $$n $(BDIR)/CD$$n \
+			$(OUT)/$(call CDBASE,$$n).raw; \
+		fi; \
+	done
+ifeq ($(LIVE_FILESYSTEM),1)
+	-for p in $(LIVEIMAGES)/$(FULLARCH)*.manifest; do \
+		f=`basename $$p`; \
+		cp -a $$p $(OUT)/$(call CDBASE,$$n).`echo $$f|cut -d. -f2-`; \
+	done
+	-if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-remove ]; then \
+		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(call CDBASE,$$n).manifest-remove; \
+	elif [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-desktop ]; then \
+		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop; \
+	fi
+	-if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-minimal-remove ]; then \
+		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-minimal-remove $(OUT)/$(call CDBASE,$$n).manifest-minimal-remove; \
+	fi
+ifeq ($(CDIMAGE_SQUASHFS_BASE),1)
+	-cp -a $(LIVEIMAGES)/$(FULLARCH).squashfs $(OUT)/$(call CDBASE,$$n).squashfs
+	-cp -a $(LIVEIMAGES)/$(FULLARCH).squashfs.gpg $(OUT)/$(call CDBASE,$$n).squashfs.gpg
+endif
+endif
+
+ifeq ($(SUBARCH),ac100)
+PREINSTALLED_IMAGE_FILESYSTEM := rootfs.tar.gz
+endif
+
+bin-preinstalled_images: ok $(OUT)
+	@echo "Post-processing pre-installed images ...";
+	$(Q)set -x; \
+	mkdir -p $(BDIR)/CD1; \
+	if [ ! -e "$(LIVEIMAGES)/$(FULLARCH).$(PREINSTALLED_IMAGE_FILESYSTEM)" ]; then \
+		echo "No filesystem for $(FULLARCH)!" >&2; \
+		exit 1;	\
+	fi; \
+	mv $(LIVEIMAGES)/$(FULLARCH).$(PREINSTALLED_IMAGE_FILESYSTEM) $(OUT)/$(call CDBASE,1).raw; \
+	if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) ]; then \
+		$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) 1 $(BDIR)/CD1 \
+		$(OUT)/$(call CDBASE,1).raw; \
+	elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
+		$(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) 1 $(BDIR)/CD1 \
+		$(OUT)/$(call CDBASE,1).raw; \
+	fi; 
+	-cp -a $(LIVEIMAGES)/$(FULLARCH).manifest $(OUT)/$(call CDBASE,$$n).manifest
+	-if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-remove ]; then \
+		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(call CDBASE,$$n).manifest-remove; \
+	else \
+		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop; \
+	fi
+
+# FIXME: This only works with CD1, and not with addon CDs.
+bin-compress_images: ok $(OUT)
+	@if [ ! -e "$(OUT)/$(call CDBASE,1).raw" ]; then \
+		echo "No image for $(FULLARCH)!" >&2; \
+		exit 1; \
+	fi;
+	@file -b $(OUT)/$(call CDBASE,1).raw > $(OUT)/$(call CDBASE,1).type
+	@if ! grep -q '^gzip' $(OUT)/$(call CDBASE,1).type; then \
+		set -e; \
+		gzip -9 --rsyncable $(OUT)/$(call CDBASE,1).raw; \
+		mv $(OUT)/$(call CDBASE,1).raw.gz $(OUT)/$(call CDBASE,1).raw; \
+	fi;
+	@if [ "$(PREINSTALLED_IMAGE_FILESYSTEM)" = "rootfs.tar.gz" ]; then \
+		echo "tar archive" > $(OUT)/$(call CDBASE,1).type; \
+	fi;
+
+src-images: ok src-md5list $(OUT)
+	@echo "Generating the source iso/jigdo images ..."
+	$(Q)set -e; set -x; \
+	 for file in $(SDIR)/*.sources; do \
+		dir=$${file%%.sources}; \
+		n=$${dir##$(SDIR)/}; \
+		num=$$n; \
+		dir=$(SDIR)/CD$$n; \
+		cd $$dir/..; \
+		opts=`cat $(SDIR)/$$n.mkisofs_opts`; \
+		volid=`cat $(SDIR)/$$n.volid`; \
+		rm -f $(OUT)/$(call CDSRCBASE,$$n).raw; \
+		if [ "$(DOJIGDO)" = "0" ]; then \
+			$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+			  -o $(OUT)/$(call CDSRCBASE,$$n).raw $$opts CD$$n ; \
+			chmod +r $(OUT)/$(call CDSRCBASE,$$n).raw; \
+		elif [ "$(DOJIGDO)" = "1" ]; then \
+			$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+			  -o $(OUT)/$(call CDSRCBASE,$$n).raw \
+			  -jigdo-jigdo $(OUT)/$(call CDSRCBASE,$$n).jigdo \
+			  -jigdo-template $(OUT)/$(call CDSRCBASE,$$n).template \
+			  -jigdo-map Debian=$(MIRROR)/ \
+			  -md5-list $(SDIR)/md5-check \
+			  $(JIGDO_OPTS) $$opts CD$$n ; \
+			chmod +r $(OUT)/$(call CDSRCBASE,$$n).raw; \
+		elif [ "$(DOJIGDO)" = "2" ]; then \
+			$(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+			  -o /dev/null \
+			  -jigdo-jigdo $(OUT)/$(call CDSRCBASE,$$n).jigdo \
+			  -jigdo-template $(OUT)/$(call CDSRCBASE,$$n).template \
+			  -jigdo-map Debian=$(MIRROR)/ \
+			  -md5-list $(SDIR)/md5-check \
+			  $(JIGDO_OPTS) $$opts CD$$n ; \
+		fi; \
+		if [ "$(DOJIGDO)" != "0" ]; then \
+			$(jigdo_cleanup) $(OUT)/$(call CDSRCBASE,$$n).jigdo \
+				$(call CDSRCBASE,$$n).iso $(SDIR)/CD$$n \
+				`echo "$(JIGDOTEMPLATEURL)" | sed -e 's|%ARCH%|src|g'`"$(call CDSRCBASE,$$n).template" \
+				$(SRCDISKINFOND) \
+				$(JIGDOFALLBACKURLS) ; \
+		fi; \
+	done
+
+# Generate the *.list files for the Pseudo Image Kit
+pi-makelist:
+	$(Q)set -e; \
+	 cd $(OUT); for file in `find * -name \*.raw`; do \
+	     if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
+	         $(BASEDIR)/tools/pi-makelist-vfat \
+	             $$file > $${file%%.raw}.list; \
+	     elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
+	         $(BASEDIR)/tools/pi-makelist \
+	             $$file > $${file%%.raw}.list; \
+	     fi \
+	 done
 
 # Generate only one image number $(CD)
-image: check-number-given images
-
-# Calculate the md5sums for the images (if available), or get from templates
+image: bin-image
+bin-image: ok bin-md5list $(OUT)
+	@echo "Generating the binary iso image n°$(CD) ..."
+	@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
+	set -e; cd $(BDIR); opts=`cat $(CD).mkisofs_opts`; \
+	 volid=`cat $(CD).volid`; \
+	 rm -f $(OUT)/$(call CDBASE,$(CD)).raw; \
+	 if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
+	 if [ -d boot$(CD)/ ]; then \
+	   cp -a boot$(CD)/* CD$(CD); \
+	 fi; \
+	 $(make_vfat_img) -d CD$(CD) -o $(OUT)/$(call CDBASE,$(CD)).raw; \
+	 elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
+	 $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+	  -o $(OUT)/$(call CDBASE,$(CD)).raw $$opts CD$(CD); \
+	 chmod +r $(OUT)/$(call CDBASE,$(CD)).raw; \
+	 fi; \
+         if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) ]; then \
+                $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) $(CD) $(BDIR)/CD$(CD) \
+                 $(OUT)/$(call CDBASE,$(CD)).raw; \
+         elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
+                $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
+                 $(OUT)/$(call CDBASE,$(CD)).raw; \
+         fi
+
+src-image: ok src-md5list $(OUT)
+	@echo "Generating the source iso image n°$(CD) ..."
+	@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
+	set -e; cd $(SDIR); opts=`cat $(CD).mkisofs_opts`; \
+	 volid=`cat $(CD).volid`; \
+	 rm -f $(OUT)/$(call CDSRCBASE,$(CD)).raw; \
+         $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
+	  -o $(OUT)/$(call CDSRCBASE,$(CD)).raw $$opts CD$(CD); \
+	 chmod +r $(OUT)/$(call CDSRCBASE,$(CD)).raw
+
+
+#Calculate the md5sums for the images (if available), or get from templates
 imagesums:
-	$(Q)$(BASEDIR)/tools/imagesums $(OUT) $(SUMS_EXTENSION)
+	$(Q)cd $(OUT); :> MD5SUMS; :> SHA1SUMS; for file in `find * -name \*.raw`; do \
+		$(md5sum) "$$file" >>MD5SUMS; \
+		$(sha1sum) "$$file" >>SHA1SUMS; \
+		$(sha256sum) "$$file" >>SHA256SUMS; \
+	done; \
+	for file in `find * -name \*.template`; do \
+		if [ "`tail --bytes=33 "$$file" | head --bytes=1 | od -tx1 -An | sed -e 's/ //g'`" != 05 ]; then \
+			echo "Possibly invalid template $$file"; exit 1; \
+		fi; \
+		grep -q " $${file%%.template}.raw"'$$' MD5SUMS \
+		 || echo "`tail --bytes=26 "$$file" | head --bytes=16 | od -tx1 -An | sed -e 's/ //g'`  $${file%%.template}.raw" >>MD5SUMS; \
+	done
+
+# Likewise, the file size can be extracted from the .template with:
+# tail --bytes=32 $$file | head --bytes=6 | od -tx1 -An \
+#  | tr ' abcdef' '\nABCDEF' | tac | tr '\n' ' ' \
+#  | sed -e 's/ //g; s/^.*$/ibase=16 & /' | tr ' ' '\n' | bc
 
 ## MISC TARGETS ##
 
-$(BDIR)/md5-check: mirrorcheck	
-
-mirrorcheck: ok
-	$(Q)$(grab_md5) $(MIRROR) "$(ARCHES)" $(CODENAME) $(DI_CODENAME) $(BDIR)/md5-check
-	$(Q)for ARCH in $(ARCHES); do \
-		if [ -e $(BASEDIR)/data/$(CODENAME)/$$ARCH/extra-sources ]; then \
-			echo "Extra dedicated source added; need to grab source MD5 info too"; \
-			$(grab_md5) $(MIRROR) source $(CODENAME) $(DI_CODENAME) $(BDIR)/md5-check; \
-		fi; \
-	done
+tasks: ok $(BASEDIR)/data/$(CODENAME)/master
+	$(master2tasks)
+
+readme:
+	sensible-pager $(BASEDIR)/README
+
+conf:
+	sensible-editor $(BASEDIR)/CONF.sh
+
+mirrorcheck-binary: ok
+	rm -f $(BDIR)/md5-check
+	$(Q)$(grab_md5) $(MIRROR) $(ARCH) $(CODENAME) $(BDIR)/md5-check
+	if [ -n "$(NONUS)" ]; then \
+		$(grab_md5) $(NONUS) $(ARCH) $(CODENAME) $(BDIR)/md5-check; \
+	fi
+	if [ -n "$(SECURITY)" ]; then \
+		$(grab_md5) $(SECURITY) $(ARCH) $(CODENAME)-security $(BDIR)/md5-check; \
+	fi
+	if [ "$(UPDATES)" = 1 ]; then \
+		$(grab_md5) $(MIRROR) $(ARCH) $(CODENAME)-updates $(BDIR)/md5-check; \
+	fi
+	if [ "$(PROPOSED)" = 1 ]; then \
+		$(grab_md5) $(MIRROR) $(ARCH) $(CODENAME)-proposed $(BDIR)/md5-check; \
+	fi
+
+mirrorcheck-source: ok
+	rm -f $(SDIR)/md5-check
+	$(Q)$(grab_md5) $(MIRROR) source $(CODENAME) $(SDIR)/md5-check
+	if [ -n "$(NONUS)" ]; then \
+		$(grab_md5) $(NONUS) source $(CODENAME) $(SDIR)/md5-check; \
+	fi
+	if [ -n "$(SECURITY)" ]; then \
+		$(grab_md5) $(SECURITY) source $(CODENAME)-security $(SDIR)/md5-check; \
+	fi
+	if [ "$(UPDATES)" = 1 ]; then \
+		$(grab_md5) $(MIRROR) source $(CODENAME)-updates $(SDIR)/md5-check; \
+	fi
+	if [ "$(PROPOSED)" = 1 ]; then \
+		$(grab_md5) $(MIRROR) source $(CODENAME)-proposed $(SDIR)/md5-check; \
+	fi
 
 update-popcon:
-	$(update_popcon) tasks/$(CODENAME)/popularity-contest
+	rm -f popcon-inst
+	( \
+		echo '/*' ; \
+		echo '   Popularity Contest results' ; \
+		echo '   See the README for details on updating.' ; \
+		echo '' ; \
+		echo '   Last update: $(shell date)' ; \
+		echo '*/' ; \
+		echo '' ; \
+	) > tasks/popularity-contest-$(CODENAME)
+	wget --output-document popcon-inst \
+		http://popcon.debian.org/main/by_inst \
+		http://popcon.debian.org/contrib/by_inst
+	grep -h '^[^#]' popcon-inst | egrep -v '(Total|-----)' | \
+		sort -rn -k3,3 -k7,7 -k4,4 | grep -v kernel-source | \
+		awk '{print $$2}' >> tasks/popularity-contest-$(CODENAME)
+	rm -f popcon-inst
 
 # Little trick to simplify things
-official_images: ok init packagelists image-trees images
+official_images: bin-official_images src-official_images
+bin-official_images: ok bootable upgrade app-install bin-images
+src-official_images: ok src-infos src-images
+
+$(CODENAME)_status: ok init
+	@echo "Using the provided status file for $(CODENAME)-$(ARCH) ..."
+	$(Q)cp $(BASEDIR)/data/$(CODENAME)/status.$(ARCH) $(ADIR)/status \
+	 2>/dev/null || $(MAKE) status || $(MAKE) correctstatus

=== renamed file 'Makefile' => 'Makefile.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2021-10-05 08:01:22 +0000
@@ -1,33 +1,32 @@
-debian-cd
-=========
+YACS - Yet Another CD Script :-)
+================================
+(better known as debian-cd)
 
-Copyright 1999-2001 Raphaël Hertzog <[e-mail]> and others,
-2004-2010 Steve McIntyre <[e-mail]>
-This set of tools is licensed under the General Public License version
-2 or any later version. You can find it in
+Copyright 1999-2001 Raphaël Hertzog <[e-mail]>
+This set of tools is licensed under the General Public License
+version 2 or any later version. You can find it in 
 /usr/share/common-licenses/GPL on a Debian GNU system.
 
-Some of the ideas here (a loooong time ago) came from Steve McIntyre's
-slink_cd script.
+Thanks to Steve McIntyre <[e-mail]> for his
+work on slink_cd/debian_cd. Some ideas come from his script.
 
-Thanks also to all the contributors on the debian-cd mailing list.
+Thanks to all the contributors on the debian-cd mailing list.
 
 What is needed?
 ===============
 Software:
 - the apt-get (>= 0.3.11.1) tool
+- apt-utils (for apt-ftparchive)
 - perl (>= 5.004)
 - bash (or another POSIX shell)
 - make
-- cpp
-- mkisofs/genisoimage
+- mkisofs/mkhybrid (mkisofs also provides the isoinfo binary used by the
+  Pseudo Image Kit)
 - the perl Digest::MD5 module
-- the perl Compress::Zlib module
 - lynx (for text version of README.html) and todos from sysutils
   to convert docs to DOS format (although you can rip that out, too)
 - if you want to generate jigdo files: jigdo-file (see below)
 Other:
-- apt-utils (for apt-ftparchive)
 - lots of free space on your disks
 - a Debian mirror, on a partition where you can write.
   If you can't write on it then you may try to use a symlink farm,
@@ -39,31 +38,27 @@
 		-------------------------------
 
 
-For the people that don't have time, here's the quick explanation
-=================================================================
+For the people that don't have time, here's the quick explanation:
+==================================================================
 
 Edit the CONF.sh and change the PATHs for the mirror and so on.
 $ sensible-editor CONF.sh
 $ . CONF.sh
 $ make distclean
 $ make status
+$ make list COMPLETE=1 SIZELIMIT1=625000000 SRCSIZELIMIT=665000000
 $ make official_images
+[ alternatively, if you only want binary images:
+  $ make bin-official_images ]
 
 However, you really should consider reading further for more information.
-You can also take a look at build.sh and build_all.sh for an automated
+You can also take a look at build.sh and build_all.sh for an automatized
 way of building CD images. 
 
-The script easy-build.sh offers the easiest way to build a specific image
-or set of images, but is still very flexible and powerful. It is the
-recommended tool for building test images and for people new to debian-cd.
-See the file README.easy-build for further info.
-
 How to build a CD set - step by step
 ====================================
 
-If you haven't already, change to the /usr/share/debian-cd/ directory
-(or, alternatively, set the variable BASEDIR in CONF.sh to point
-there).
+If you haven't already, change to the /usr/share/debian-cd/ directory.
 
 The process of building a CD is composed of the following steps:
 
@@ -78,9 +73,9 @@
   have to build them one after the other (you may use a shell
   script for this).
 
-  Note that the temporary dir must be on the same device as the
+  Note that the temporary dir must be on the same device than the
   mirror because debian-cd uses hardlinks for generating an image 
-  tree. If you can't do this, you'll have to use a symlink farm.
+  tree. If you can't do this, you'll have to use the symlink farm.
   The symlink farm is explained at the end of this README.
 
   Keep in mind that the environment variables will stay in the
@@ -88,11 +83,15 @@
   other program using the same variables (e.g. kernel-package).
   So if you want to be 100% safe, run debian-cd in a
   separate shell that you can leave after you're done.
-
+  
 - then we clean everything that may still be there from previous runs:
 
     $ make distclean
 
+- now we'll check if your mirror is ok (with good Packages files):
+
+    $ make mirrorcheck
+
 - then we initialize the temporary directory used for the build:
 
     $ make status
@@ -106,65 +105,58 @@
 
 - now you can decide what you want on your CDs
 
-  Note that task files are always taken from the subdirectory in ./tasks/
-  that matches the CODENAME environment variable. At the beginning of a
-  build these "static" task files are copied to the working directory.
-  During the build some additional task files - that are referenced from
-  the static task files - are generated automatically using scripts from
-  the ./tools directory.
-
-  Examples:
-
-    $ make packagelists TASK=Debian-generic COMPLETE=1
-
-  or
-
-    $ make packagelists TASK=Debian-kde COMPLETE=0
-
-  or
-
-    $ export NONFREE=1; make packagelists TASK=your-task-here COMPLETE=1
-
-  or for something like an official image for the USA (without non-free):
-
-    $ make packagelists COMPLETE=1
+    $ make list TASK=tasks/debian-2.2 COMPLETE=1
+
+  or
+
+    $ make list TASK=tasks/gnome COMPLETE=0 SIZELIMIT=576716800
+
+  or
+
+    $ export NONFREE=1; make list TASK=tasks/your-task-here COMPLETE=1
+
+  or for something like an official image for the USA (without non-US &
+  non-free) :
+
+    $ make list COMPLETE=1 SIZELIMIT1=576716800
 
   .... take a look at the file tasks/* to see the options you can have :)
-
+  
   You can change the behaviour of this command with the following
   variables:
+  - if NONUS is set, then packages from non-US will be allowed (the value
+    of NONUS must be the path to the non-US mirror if you have one)
+  - if FORCENONUSONCD1 is set also, then packages will be
+    rearranged so that non-US packages are all on CD#1. This
+    includes the non-free ones if you specify NONFREE. Then 2 separate
+    copies of CD#1 will be produced, identical in every respect except
+    for the inclusion/lack of non-US packages. The same happens for
+    the source CDs when they are built.
   - if NONFREE is set, then packages from non-free will be allowed
     (NONFREE must be exported to all sub-shells)
   - if EXTRANONFREE is set, then non-free packages will be included
     on an extra CD (the last CD in fact). Don't use NONFREE and
-    EXTRANONFREE at the same time!
+    EXTRANONFREE at the same time !
     (EXTRANONFREE must be exported to all sub-shells)
   - if COMPLETE is set, all packages that are not listed in the
     selected task file will be included at the end
-  - setting INSTALLER_CD will use an appropriate task file for
-    building small CDs (businesscard and netinst)
-
-- now, we'll start making temporary trees:
-
-    $ make image-trees
-
-  This will first work sort the list of packages for each architecture
-  into order so that standard, required, important and base packages
-  are placed first, then other packages will be added in the order
-  given modulo dependency ordering. Once the sorted list is created,
-  the different architecture lists will be merged (if more than one
-  architecture is selected).
-
-  Then the code will start laying out temporary directory trees for
-  the CDs. In order, this includes the following steps:
-
-  - Creating an empty directory layout
-  - Generating an image label and volume ID and other metadata such as
-    debian-installer information files
-  - Add documentation and installation/upgrade tools
-  - Add Release files and other archive metadata
-  - Make the image bootable for the selected architecture(s)
-  - Start generating the md5sum.txt file
+  - if SIZELIMIT is set, it will be used as the maximum size that
+    we can put into each CD
+  - if SIZELIMIT<X> (with <X> beeing a integer) is set, it will be used 
+    as the maximum size of the X'th binary CD. SIZELIMIT<X> overrides
+    SIZELIMIT ...
+  - if SRCSIZELIMIT is set, it's used as the maximum size for source CD
+  - if SRCSIZELIMIT<X> (with <X> beeing an integer) is set, it will be
+    used as the maximum size of the X'th source CD
+
+  This target calls the targets "bin-list" and "src-list" that can be used to
+  build only binary CDs or only source CDs.
+
+- it may be time to add the disks-arch stuff and to make the CDs bootable:
+
+    $ make bootable
+
+  This affects only the binary CDs.
 
   If you want to use boot-floppies built by yourself you can add
   a parameter BOOTDISKS=<dir> which specifies the directory where
@@ -173,40 +165,57 @@
   mirror. Your boot-floppies must also be on the same partition as
   your mirror and temporary dir (hardlinks are used here too).
 
-  Once the disc tree has all of this start data, we start filling the
-  directory trees with packages from the sorted list. The size of the
-  image to be created is set using DISKTYPE in CONF.sh; if the
-  standard sizes do not match what you're after, use DISKTYPE=CUSTOM
-  and specify your own size using CUSTOMSIZE. The algorithm is simple
-  for adding packages:
-
-  - link the package into the temporary disc tree
-  - append the metadata to the appropriate Packages or Sources file
-  - add md5sum information for the added file(s) to the md5sum.txt file
-
-  This continues until the temporary tree grows one package *too
-  large* for the selected image size. At that point, we roll back the
-  last set of changes associated with that package. Then:
-
-  - check if the disc contains all the packages needed to install a base system
-  - finish off the Release file, using the checksums of the
-    Packages/Sources files we generated
-  - finish off the md5sum.txt file
-
-  Next, we continue to the next disc tree, using the same process:
-  start it, copy packages in until they overflow, roll back and
-  finish. And repeat. Each time a package is found to be too large to
-  fit inside an image, it will be kept back and will (obviously) be
-  the first package placed into the next disc tree.
+  Size calculation is imprecise for bootable CDs (usually the first CDs
+  in the set), so you may need to manually adjust SIZELIMIT* variables
+  to account for the size of the booting stuff used.
+
+- now, we'll add the binary packages to the temporary tree:
+
+    $ make packages
+
+- and we'll add the sources to the temporary tree:
+
+    $ make sources
+
+- if you want to install additional files:
+
+    $ make bin-extras CD=1 ROOTSRC=/home/ftp/ DIR=goodies/wordperfect
+    $ make src-extras CD=3 ROOTSRC=/home/ftp/ DIR=goodies/kernel-2.3
+
+  The first will copy /home/ftp/goodies/wordperfect/ to the first binary
+  CD. It will be in <root of the cd>/goodies/wordperfect/. You can call
+  make extras multiple times if you need more.
+
+  Please note that the files to be copied should be on the same partition
+  than your mirror (unless you use a symlink farm).
+
+  If you want to do customize your CD even more, you can use the hook
+  system. Read more about that below.
+
+- We can add an md5sum.txt file on each CD to enable users to check their
+  files:
+
+    $ make md5list
+
+  This calls the targets 'bin-md5list' and 'src-md5list'. You can
+  choose to call only bin-md5list if you're building only binary images.
 
 - now we can create the images:
 
     $ make images
 
   If you don't have enough space for all images, you can generate 
-  only one image (of the second CD for example) with:
-
-    $ make image CD=2
+  only one image (of the second binary CD for example) with:
+
+    $ make bin-image CD=2
+
+  Of course if you want to build all binary images you'll use:
+
+    $ make bin-images
+
+  The following will generate the source images:
+
+    $ make src-images
 
   Note: here we use "make images", but you could as well use
   "make official_images" since the latter is the same as the former
@@ -218,6 +227,7 @@
 
     $ make imagesums
 
+
 Official images
 ===============
 
@@ -262,6 +272,17 @@
 Additional targets
 ==================
 
+Image format
+------------
+
+You may want to generate images in ISO 9660 or VFAT formats.
+
+Set the IMAGE_FORMAT variable in CONF.sh.  You can choose "iso" for generation
+of .iso (default), or "vfat" for generation of .img.
+
+Note that the optional jigdo format generation is currently only possible for
+ISO images.
+
 Jigdo
 -----
 You may also want to make the CD images available in jigdo format.
@@ -273,9 +294,16 @@
 only .iso generation (default), only .jigdo generation (for highly reduced
 disk usage), or both .iso and .jigdo generation.
 
-To generate the jigdo files and templates, you need an
-appropriately-patched version of mkisofs/genisoimage, as shipped in
-Debian Etch.
+To generate the jigdo files and templates, you need the "jigdo-file" program,
+which is available via the same URL.
+
+Jigdo-file creates and maintains a cache/database file with checksums of
+all files on your Debian mirror. The first time, this may take hours to be
+generated (use "top" to see what's going on), so it's wise to keep the
+cache in your homedir and not delete it ever. 
+
+Note that jigdo-file can easily use 60+ MB of working memory, so don't use
+this on machines with less than 128 MB RAM.
 
 The MD5SUMS file generated by the "imagesums" target will contain the MD5
 checksums of all generated images, regardless of the DOJIGDO setting. If
@@ -307,15 +335,24 @@
 is suitable for use as a fallback mirror. It is populated with hard
 links to the archive contents. In CONF.sh, simply supply as
 JIGDOFALLBACKPATH the name of the directory, and as JIGDOFALLBACKURLS
-the URLs under which it will be made available.
+the URLs under which it will be made available (two separate URLs are
+necessary, one for "Debian" and one for "Non-US").
+
 
 About the hook system
 =====================
 
-A hook script can be executed at different times during the CD build
-process to customise your CDs. You can specify the script by setting
-the various HOOK variables in CONF.sh; look there for more information
-about what hook points are available.
+A hook script can be executed at different times. You can specify the
+script by setting the HOOK variable to the script filename. It will
+get 2 arguments, the first is the CD number. The second depends on
+where/when the hook script is called. It can be 'before-scanpackages'
+or 'before-mkisofs' (their values are explicit ...). When the script
+is called, the current directory will be the temporary directory used for
+the build (aka $TDIR/$CODENAME-$ARCH).
+
+There are hooks only for binary CDs at the present time. If HOOK is not
+set, it will look for a script $BASEDIR/tools/$CODENAME.hook.
+
 
 About the symlink farm
 ======================
@@ -333,3 +370,6 @@
 Note that you will also need a patched mkhybrid that does support the
 -F option. Have a look here about it :
 http://www.chiark.greenend.org.uk/~stevem/DebianCD/
+
+The mkhybrid package in Debian does support this -F option since 
+potato (Debian 2.2).

=== added file 'README.devel'
--- README.devel	1970-01-01 00:00:00 +0000
+++ README.devel	2021-10-05 08:01:22 +0000
@@ -1,20 +1,21 @@
-README for those who want to hack on debian-cd
-----------------------------------------------
+README for those who want to hack on yacs/debian-cd
+---------------------------------------------------
 
 Organisation :
 --------------
 
-The main source is in the Debian svn. If you want to hack on debian-cd
+The main source is in the Debian CVS. If you want to hack on debian-cd
 and if you want to send me patches, please work on the latest version
-available in svn.
-
-auth: svn+ssh://svn.debian.org/svn/debian-cd/trunk
-anon: svn://svn.debian.org/debian-cd/trunk
-web:  http://svn.debian.org/wsvn/debian-cd
-
-If you want to discuss anything related to the debian-cd development,
-mail the [e-mail] mailing list where all people
-interested in the debian-cd development are subscribed.
+available in the CVS.
+
+http://cvs.debian.org/debian-cd/
+
+$ cvs -d :pserver:[e-mail]:/cvs/debian-boot co debian-cd
+
+If you want to discuss anything related to the debian-cd development, you
+can contact me directly or, better, you can mail the
[e-mail] mailing list where all people interested in the
+debian-cd development are subscribed.
 
 Technical details :
 -------------------
@@ -35,8 +36,8 @@
 Each tool is self-documented, if you want to know what it
 does read the sources (they are scripts).
 
-Debugging debian-cd :
----------------------
+Debugging YACS :
+----------------
 
 If you want to read more about what YACS is doing you can set
 the VERBOSE environment variable to 1, 2 or 3 depending on the
@@ -46,14 +47,16 @@
 can take a look at them if you want to check for warnings 
 and so on.
 Log files :
-- $TDIR/$CODENAME/log.list2cds
-- $TDIR/$CODENAME/make_disc_trees.log
+- $TDIR/$CODENAME-$ARCH/log.list2cds
+- $TDIR/$CODENAME-SRC/log.cds2src
 
 TODO list :
 -----------
 + put the doc directory only on the first binary CD
 + a way to force the inclusion of packages (even broken)
 + possibility to add project/* to the last CD
++ check the source files on the mirror (with Sources.gz)
+  when doing make mirrorcheck
 
 Bugs / Problems :
 -----------------
@@ -72,4 +75,7 @@
 being the same "2.88Mb boot image". Both multiboot mechanism may
 not work on older hardware with very old BIOSes however the el-torito
 one works a bit better because it's usually able to boot the first choice
-without displaying the menu then.
+without displaying the menu then. This is a non-issue since people
+may still boot on CD 2,3,4,5 with the usual boot method if the multiboot
+doesn't work.
+

=== renamed file 'README.devel' => 'README.devel.moved'
=== renamed file 'README' => 'README.moved'
=== added file 'build.sh'
--- build.sh	1970-01-01 00:00:00 +0000
+++ build.sh	2021-10-05 08:01:22 +0000
@@ -1,90 +1,75 @@
-#!/bin/bash -e
+#!/bin/sh -e
 
-# Script to build images for one or more architectures and/or source
+# Script to build one arch
 
 if [ -z "$CF" ] ; then
     CF=./CONF.sh
 fi
 . $CF
 
-START=`date -u`
-echo "$START: Using CONF from $CF."
-
 if [ -z "$COMPLETE" ] ; then
     export COMPLETE=1
 fi
 
-if [ $# -gt 1 ] ; then
-    echo "ERROR: too many arguments." >&2
-    exit 1
-elif [ -n "$1" ] ; then
-    export ARCHES="$1"
-fi
-
-PATH=$BASEDIR/tools:$PATH
-export PATH
-
-if [ "$TASK"x = ""x ] ; then
-	case "$INSTALLER_CD"x in
-		"1"x)
-			TASK=debian-installer
-			unset COMPLETE
-			;;
-		"2"x|"C"x)
-			TASK=debian-installer+kernel
-			unset COMPLETE
-			;;
-		*)
-			COMPLETE=1
-			;;
-	esac
-fi
-
-export TASK COMPLETE
+if [ -n "$1" ] ; then
+    FULLARCH="$1"
+    export ARCH="${FULLARCH%%+*}"
+    if [ "$ARCH" = "$FULLARCH" ]; then
+        export SUBARCH=
+    else
+        export SUBARCH="${FULLARCH#*+}"
+    fi
+fi
 
 make distclean
 make ${CODENAME}_status
-echo " ... checking your mirror"
-RET=""
-make mirrorcheck || RET=$?
-if [ "$RET" ]; then
-	echo "ERROR: Your mirror has a problem, please correct it." >&2
-	exit 1
-fi
+if [ "$SKIPMIRRORCHECK" = "yes" ]; then
+    echo " ... WARNING: skipping mirror check"
+else
+    echo " ... checking your mirror"
+    make mirrorcheck-binary
+    make mirrorcheck-source
+    if [ $? -gt 0 ]; then
+	    echo "ERROR: Your mirror has a problem, please correct it." >&2
+	    exit 1
+    fi
+fi
+echo " ... selecting packages to include"
+if [ -e ${MIRROR}/dists/${DI_CODENAME}/main/disks-${ARCH}/current/. ] ; then
+	disks=`du -sm ${MIRROR}/dists/${DI_CODENAME}/main/disks-${ARCH}/current/. | \
+        	awk '{print $1}'`
+else
+	disks=0
+fi
+if [ -f $BASEDIR/tools/boot/$DI_CODENAME/boot-$FULLARCH.calc ]; then
+    . $BASEDIR/tools/boot/$DI_CODENAME/boot-$FULLARCH.calc
+fi
+SIZE_ARGS=''
+for CD in 1; do
+	size=`eval echo '$'"BOOT_SIZE_${CD}"`
+	[ "$size" = "" ] && size=0
+	[ $CD = "1" ] && size=$(($size + $disks))
+	mult=`eval echo '$'"SIZE_MULT_${CD}"`
+	[ "$mult" = "" ] && mult=100
+    FULL_SIZE=`echo "($DEFBINSIZE - $size) * 1024 * 1024" | bc`
+	echo "INFO: Reserving $size MB on CD $CD for boot files.  SIZELIMIT=$FULL_SIZE."
+    if [ $mult != 100 ]; then
+        echo "  INFO: Reserving "$((100-$mult))"% of the CD for extra metadata"
+        FULL_SIZE=`echo "$FULL_SIZE * $mult" / 100 | bc`
+        echo "  INFO: SIZELIMIT now $FULL_SIZE."
+    fi
+	SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE"
+done
 
+FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
+make bin-list $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+echo " ... building the images"
+export OUT="$OUT/$FULLARCH"
+mkdir -p "$OUT"
 if [ -z "$IMAGETARGET" ] ; then
-    IMAGETARGET="official_images"
-fi
-echo " ... building the images; using target(s) \"$IMAGETARGET\""
-
-if [ "$MAXISOS"x = ""x ] ; then
-    export MAXISOS="ALL"
-fi
-if [ "$MAXJIGDOS"x = ""x ] ; then
-    export MAXJIGDOS="ALL"
-fi
-
-if [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] ; then
-    NUMISOS="all available"
-elif [ "$MAXISOS" -eq 0 ] ; then
-    NUMISOS="no"
-else
-    NUMISOS="up to $MAXISOS"
-fi
-if [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] ; then
-    NUMJIGDOS="all available"
-elif [ "$MAXJIGDOS" -eq 0 ] ; then
-    NUMJIGDOS="no"
-else
-    NUMJIGDOS="up to $MAXJIGDOS"
-fi
-echo "Building $NUMJIGDOS jigdos and $NUMISOS isos for $ARCHES $DISKTYPE"
-
-make $IMAGETARGET
-
-if [ "$IMAGESUMS"x = 1x ]; then
-	make imagesums
-fi
-
-END=`date -u`
-echo "$END: Finished."
+    IMAGETARGET="bin-official_images"
+fi
+make $IMAGETARGET $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+
+make imagesums
+make pi-makelist

=== renamed file 'build.sh' => 'build.sh.moved'
=== added file 'build_all.sh'
--- build_all.sh	1970-01-01 00:00:00 +0000
+++ build_all.sh	2021-10-05 08:01:22 +0000
@@ -2,69 +2,121 @@
 
 # Script to build everything possible : sources and binaries for all archs
 
-if [ -z "$CF" ] ; then
-    CF=./CONF.sh
-fi
-. $CF
-
-echo "Using CONF from $CF"
-
-if [ -z "$COMPLETE" ] ; then
-    export COMPLETE=1
-fi
-
-PATH=$BASEDIR/tools:$PATH
-export PATH
-
-if [ "$TASK"x = ""x ] ; then
-	case "$INSTALLER_CD"x in
-		"1"x)
-			TASK=debian-installer
-			unset COMPLETE
-			;;
-		"2"x|"C"x)
-			TASK=debian-installer+kernel
-			unset COMPLETE
-			;;
-		*)
-			COMPLETE=1
-			;;
-	esac
-fi
-
-export TASK COMPLETE
-
+. ./CONF.sh
+
+rm -rf "$TDIR"
+rm -rf "$OUT"
 TMP_OUT=$OUT
 
-if [ -z "$IMAGETARGET" ] ; then
-	IMAGETARGET="official_images"
+if [ -z "$ARCHES" ]; then
+	export ARCHES='amd64 i386 powerpc'
 fi
 
-for ARCHES in i386 amd64 armel armhf ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 source
+for FULLARCH in $ARCHES
 do
-	export ARCHES
-	echo "Now we're going to build CD for $ARCHES !"
+	export ARCH="${FULLARCH%%+*}"
+	if [ "$ARCH" = "$FULLARCH" ]; then
+		export SUBARCH=
+	else
+		export SUBARCH="${FULLARCH#*+}"
+	fi
+	echo "Now we're going to build CD for $FULLARCH !"
+	if type find-mirror >/dev/null 2>&1; then
+		# TODO: nasty upcall to cdimage wrapper scripts
+		export MIRROR="$(find-mirror "$ARCH")"
+		if [ "$SECURITY" ]; then
+			export SECURITY="$MIRROR"
+		fi
+	fi
 	echo " ... cleaning"
-
 	make distclean
 	make ${CODENAME}_status
 	echo " ... checking your mirror"
-	RET=""
-	make mirrorcheck || RET=$?
-	if [ "$RET" ]; then
+	if [ "$SKIPMIRRORCHECK" != "yes" ] ; then 
+		make mirrorcheck-binary
+      	if [ "$FULLARCH" = "i386" ]; then
+            make mirrorcheck-source
+        fi
+	else
+		echo "WARNING: skipping mirrorcheck"
+	fi
+
+	if [ $? -gt 0 ]; then
 		echo "ERROR: Your mirror has a problem, please correct it." >&2
 		exit 1
 	fi
-
-	OUT="$TMP_OUT/$ARCHES"
-	export OUT
-	mkdir -p $OUT
-	echo " ... building the images; using target(s) \"$IMAGETARGET\""
-	make $IMAGETARGET
-
-	if [ "$IMAGESUMS"x = 1x ]; then
-		make imagesums
-	fi
-
+	echo " ... selecting packages to include"
+	if [ -e ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. ] ; then
+		disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
+				awk '{print $1}'`
+	else
+		disks=0
+	fi
+	if [ -f $BASEDIR/tools/boot/$CODENAME/boot-$FULLARCH.calc ]; then
+	    . $BASEDIR/tools/boot/$CODENAME/boot-$FULLARCH.calc
+	fi
+	SIZE_ARGS=''
+	for CD in 1; do
+		size=`eval echo '$'"BOOT_SIZE_${CD}"`
+		[ "$size" = "" ] && size=0
+		[ $CD = "1" ] && size=$(($size + $disks))
+        mult=`eval echo '$'"SIZE_MULT_${CD}"`
+        [ "$mult" = "" ] && mult=100
+        FULL_SIZE=`echo "($DEFBINSIZE - $size) * 1024 * 1024" | bc`
+        echo "INFO: Reserving $size MB on CD $CD for boot files.  SIZELIMIT=$FULL_SIZE."
+        if [ $mult != 100 ]; then
+            echo "  INFO: Reserving "$((100-$mult))"% of the CD for extra metadata"
+            FULL_SIZE=`echo "$FULL_SIZE * $mult" / 100 | bc`
+            echo "  INFO: SIZELIMIT now $FULL_SIZE."
+        fi
+        SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE"
+	done
+    FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
+	echo " ... building the images"
+	if [ "$FULLARCH" = "i386" ] && \
+	   ([ "$CDIMAGE_INSTALL" = 1 ] || [ "$CDIMAGE_ONLYSOURCE" = 1 ]) && \
+	   [ "$CDIMAGE_DVD" != 1 ] && [ "$DIST" != warty ] && \
+	   [ "$SPECIAL" != 1 ] && [ "$CDIMAGE_NOSOURCE" != 1 ]; then
+		if [ "$CDIMAGE_ONLYSOURCE" != 1 ]; then
+			make list $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+		else
+			make src-list SRCSIZELIMIT=$FULL_SIZE
+		fi
+		export OUT="$TMP_OUT/src"; mkdir -p $OUT
+		make src-official_images $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+		echo Generating list files for source images
+		make pi-makelist
+		if [ "$CDIMAGE_ONLYSOURCE" != 1 ]; then
+			export OUT="$TMP_OUT/$FULLARCH"; mkdir -p $OUT
+			make bin-official_images $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+			echo Generating list files for images
+			make pi-makelist
+		fi
+	elif [ "$CDIMAGE_PREINSTALLED" = 1 ]; then
+		export OUT="$TMP_OUT/$FULLARCH"; mkdir -p $OUT
+		make bin-preinstalled_images
+	else
+		make bin-list $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+		export OUT=$TMP_OUT/$FULLARCH; mkdir -p $OUT
+		make bin-official_images $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+		if [ $? -gt 0 ]; then
+			echo "ERROR WHILE BUILDING OFFICIAL IMAGES !!" >&2
+			if [ "$ATTEMPT_FALLBACK" = "yes" ]; then
+				echo "I'll try to build a simple (non-bootable) CD" >&2
+				make clean
+				make installtools
+				make bin-images $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+			else
+				# exit 1
+				continue
+			fi
+		fi
+		echo Generating list files for images
+		make pi-makelist
+	fi
+	if [ "$CDIMAGE_COMPRESS" = 1 ]; then
+		echo Compressing CD images
+		make bin-compress_images
+	fi
 	echo "--------------- `date` ---------------"
 done

=== renamed file 'build_all.sh' => 'build_all.sh.moved'
=== added directory 'contrib'
=== renamed directory 'contrib' => 'contrib.moved'
=== added file 'contrib/testingcds'
--- contrib/testingcds	1970-01-01 00:00:00 +0000
+++ contrib/testingcds	2021-10-05 08:01:22 +0000
@@ -2,132 +2,105 @@
 #
 # testingcds (c) 2005 Santiago Garcia Mantinan <[e-mail]>
 #
-# Updates since then by:
-# Joey Hess <[e-mail]>
-# Steve McIntyre <[e-mail]>
-#
 # GPL v2
 #
-# See cronjob.weekly and cronjob.daily for examples of how to call this script
-
-#set -x
-
-if [ "$CONF"x = ""x ] ; then
-    CONF=~/build.wheezy/CONF.sh
-fi
-export CF=$CONF
-if [ "$DCD_DIR"x = ""x ] ; then
-    DCD_DIR=~/build.wheezy/debian-cd
-fi
-export CF=$CONF
-
-now () {
-    date -u +%F:%H:%M:%S
-}
+# This file is included here just as an example, it was used when building the
+# official testing cds at some point, it was written for a very specific setup
+# and then went over a lot of changes during its life, so now this code is
+# horrible, hoever some fellows feel it should be included in debian-cd,
+# well, I (manty) will leave that on their hands.
+#
+# The setup we have uses normal debian-cd for daily builds, while it uses a jte
+# patched debian-cd for weekly builds, this is done just for speed, the script
+# should work with normal debian-cd for all kind of builds just removing -jte
+# down there. We are currently just building isos for dailies and jigdos for
+# weeklies, no snapshots being generated on the build machine, so I cannot
+# waranty that all the code down here works, again, I must stress that you
+# should take this just as an example, because part of it is untested and
+# the rest is written for a very very specific setup, so... no waranties at all
+#
+# This is how this script is called for the daily images:
+# OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 TASK=tasks/debian-installer-sarge DOJIGDO=0 DI=sarge DI_DIST=sarge ./testingcds "$arch"
+# OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 TASK=tasks/debian-installer+kernel-sarge DOJIGDO=0 DI=sarge DI_DIST=sarge ./testingcds "$arch"
+# OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=1 TASK=tasks/debian-installer-sid DOJIGDO=0 DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" ./testingcds "$arch"
+# OMIT_MANUAL=1 NORECOMMENDS=1 NOSUGGESTS=1 COMPLETE=0 INSTALLER_CD=2 TASK=tasks/debian-installer+kernel-sid DOJIGDO=0 DI=sid DI_WWW_HOME=default DI_DIR="$ARCH_DI_DIR" ./testingcds "$arch"
+# This is respectively for sarge_d-i businesscards, sarge_d-i netinsts,
+# sid_d-i businesscards, and sid_d-i netinsts.
+# Where $ARCH_DI_DIR is set to the path for the local mirror of the d-i daily
+# built images, this parameter can be omited if no mirror of the images is used
+
+# For the weekly images it is run for normal cds like this:
+# DI_DIST=sarge ./testingcds "$arch"
+# and for the dvds like this:
+# PUBDIRJIG=/path_to_the/dvd INSTALLER_CD=3 DEFBINSIZE=4440 DEFSRCSIZE=4432 DI_DIST=sarge ./testingcds "$arch"
+
 
 # Set up and cleaning
-if [ $# -lt 1 ] ; then
-    echo $0 \$ARCH
-    echo "variables: PUBDIR[ISO|JIG]"
-    exit 1
-fi
-
-if [ ! "$DATE_BUILD" ] ; then
-    DATE_BUILD=`/bin/date -u +%Y%m%d`
-fi
-
-export ARCH="$1"
-NUM_ARCHES=`echo $ARCH | wc -w`
-
-if [ ! "$JIGDOFALLBACKURLS" ] ; then
-   export JIGDOFALLBACKURLS="Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/"
-fi
-
+if [ $# -lt 1 ]
+then
+  echo $0 \$ARCH
+  echo "variables: PUBDIR[ISO|JIG]"
+  exit 1
+fi
+
+if [ ! "$DATE" ];then DATE=`/bin/date -u +%Y%m%d`;fi
+
+export ARCH=$1
+export PATH=$PATH:/sbin:/usr/sbin
+if [ ! "$PUBDIRJIG" ];then PUBDIRJIG=/org/cdimage.debian.org/www/testing/cd;fi
+if [ ! "$PUBDIRISO" ];then PUBDIRISO=/org/cdimage.debian.org/www/testing;fi
+if [ ! "$JIGDOFALLBACKURLS" ];then
+   if [ "$ARCH" = "amd64" ];then
+     export JIGDOFALLBACKURLS="Debian=http://amd64-cdsnap.debian.net/cdimage/snapshot-amd64/Debian/"
+   else
+     export JIGDOFALLBACKURLS="Debian=http://us.cdimage.debian.org/cdimage/snapshot/Debian/"
+   fi
+fi
 # $DI is used to set DI_CODENAME and also to specify the directory for images
-if [ "$DI" ] ; then
-    export DI_CODENAME="$DI"
-fi
-
-export LOG="`pwd`/log/"
-if [ "$NUM_ARCHES"x = "1"x ] ; then
-    export OUTARCH=$ARCH
-else
-    export OUTARCH="multi-arch"
-fi
-export RUN="$INSTALLER_CD$DI$OUTARCH$LOGAPPEND"
-export LOGFILE="$LOG/$RUN"
-
-case "$INSTALLER_CD" in
-    1)
-        export DISKTYPE=BC;;
-    2|7|8|C)
-        export DISKTYPE=NETINST;;
-    3|6)
-        export OUT_TYPE=dvd
-        export DISKTYPE=DVD;;
-    4)
-        export DISKTYPE=kde-CD;;
-    5)
-        export DISKTYPE=xfce-CD;;
-    A)
-        export DISKTYPE=lxde-CD;;
-    B)
-        export DISKTYPE=xfce+lxde-CD;;
-    9)
-        export OUT_TYPE=bd
-        export DISKTYPE=BD;;
-    D)
-        export OUT_TYPE=dlbd
-        export DISKTYPE=DLBD;;
-    *)  export DISKTYPE=CD;;
-esac
-
-if [ "$OUT_TYPE"x = ""x ] ; then
-    OUT_TYPE=cd
-fi
-
-export IMAGETARGET=official_images
-cd $DCD_DIR && . $CONF
-
-if [ "$OUT"x = ""x ] ; then
-    echo Config error
-    exit 1
-fi
-
-if [ "$BUILDNAME"x = ""x ] ; then
-    TRACEFILE="$OUT_TYPE-trace"
-    echo "  Making $ARCH ${DISKTYPE} in $OUT"
-else
-    TRACEFILE="$BUILDNAME-trace"
-    echo "  Making $ARCH ${DISKTYPE} (${BUILDNAME}) in $OUT"
-fi
-
-if [ "$INSTALLER_CD" = "1" ] ; then
-    export OFFICIAL="Official BusinessCard Snapshot"
-elif [ "$INSTALLER_CD" = "2" ] ; then
-    export OFFICIAL="Official NetInst Snapshot"
-elif [ "$INSTALLER_CD" = "4" ]; then
-    export OFFICIAL="Official KDE CD Snapshot"
-elif [ "$INSTALLER_CD" = "5" ]; then
-    export OFFICIAL="Official Xfce CD Snapshot"
-elif [ "$INSTALLER_CD" = "A" ]; then
-    export OFFICIAL="Official LXDE CD Snapshot"
-elif [ "$INSTALLER_CD" = "B" ]; then
-    export OFFICIAL="Official Xfce/LXDE CD Snapshot"
-elif [ "$INSTALLER_CD" = "6" ]; then
-    export OFFICIAL="Official Multi-Arch DVD"
-elif [ "$INSTALLER_CD" = "7" ]; then
-    export OFFICIAL="Official Multi-Arch Netinst"
-elif [ "$INSTALLER_CD" = "8" ]; then
-    export OFFICIAL="Official Multi-Arch Netinst"
-elif [ "$INSTALLER_CD" = "C" ]; then
-    export OFFICIAL="Unofficial Netinst including firmware"
-fi
+if [ "$DI" ];then
+  export DI_CODENAME="$DI"
+  PUBDIRJIG="$PUBDIRJIG"/"$DI"_d-i
+  PUBDIRISO="$PUBDIRISO"/"$DI"_d-i  
+fi
+
+CALC="Using previous sizes estimations."
+if [ "$INSTALLER_CD" = "1" -o "$INSTALLER_CD" = "2" ]
+then
+  # Do a tradicional build for the ISOs of the small cds
+  cd /org/cdimage.debian.org/setup/debian-cd &&
+    . ../CONF.sh
+    # this is for build.sh
+    export CF=../CONF.sh
+    export IMAGETARGET=bin-official_images
+    # to save some time
+    export SKIPMIRRORCHECK=yes
+else
+  # Do the size stimation and a JTE build for jigdos
+  cd /org/cdimage.debian.org/setup/debian-cd-jte &&
+    . ../CONF.sh &&
+    export IMAGETARGET="ok bootable upgrade bin-infos bin-list" &&
+    export CF=../CONF.sh &&
+    ./build.sh $ARCH >/dev/null 2>&1 &&
+    cd tools && CALC=`./calc` && cd ..
+    # this is for build.sh
+    if [ "$ARCH" = "i386" ]
+    then
+      export IMAGETARGET=official_images
+    else
+      export IMAGETARGET=bin-official_images
+    fi
+fi
+
+if [ ! "$OUT" ];then echo Error on the config;exit 1;fi
+
+if [ "$INSTALLER_CD" = "1" ];then export OFFICIAL="Official BusinessCard Snapshot";fi
+if [ "$INSTALLER_CD" = "2" ];then export OFFICIAL="Official NetInst Snapshot";fi
+
+export LOG="`pwd`/../log/"
 
 rm -rf "$OUT"
 mkdir -p "$OUT"
-rm -f "$PUBDIRJIG"/$OUTARCH/$TRACEFILE
-#mkdir -p "$LOG"
+mkdir -p "$LOG"
 
 overview_log="$LOG/overview"
 overview () {
@@ -138,142 +111,148 @@
     LANG=C echo "$(dpkg --print-architecture) ($(date)) $(whoami)@$(hostname | cut -d . -f 1) $1 $2" >> $overview_log
 }
 
-> $LOGFILE
+# Upgrade sarge's debian-installer task file
+# changed this old line into the new one so that amd64 doesn't break
+# cd tasks && ../tools/generate_di_list && ../tools/generate_di+k_list && cd .. || exit 1
+cd tasks && ../tools/generate_di_list ; ../tools/generate_di+k_list ; cd ..
+DEBOOTUDEB=`/bin/sed -n \
+  's/Filename: \(pool\/main\/d\/debootstrap\/debootstrap-udeb.*udeb\)$/\1/p' \
+  $MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Packages`
+if [ -z "$DEBOOTUDEB" ];then exit 1;fi
+echo "$CALC" >"$LOG/$INSTALLER_CD$DI$ARCH"
+echo Using ${DEBOOTUDEB##*/} to get packages used by d-i. >>"$LOG/$INSTALLER_CD$DI$ARCH"
+rm -rf ../debootstrap
+dpkg -x "$MIRROR/$DEBOOTUDEB" ../debootstrap
 
 # Do the actual building
-START=`now`
-if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
-    # if it went ok get things ready for publishing
-    # we treat the daily netinst images in a different way
-    if [ "$INSTALLER_CD" = "1" ] || \
-       [ "$INSTALLER_CD" = "2" ] || \
-       [ "$INSTALLER_CD" = "C" ] ; then
-
-        ##################################
-        # NETINST STUFF
-        ##################################
-
-	if [ "$INSTALLER_CD" = "C" ] ; then
-	    if [ "${DI}" = "sid" ] ; then
-		ARCHDIR=$OUT_FW_SID/$OUTARCH
-	    else
-		ARCHDIR=$OUT_FW_TST/$OUTARCH
-	    fi
-	else # non-FW build
-	    if [ "${DI}" = "sid" ] ; then
-		ARCHDIR=$OUT_FREE_SID/$OUTARCH
-	    else
-		ARCHDIR=$OUT_FREE_TST/$OUTARCH
-	    fi
-	fi
-
-	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'`
-            mv $OUT/$BASE.iso $ARCHDIR/iso-cd/$NETINSTNAME.iso
-            cat $OUT/$BASE.jigdo | \
-                sed 's/-BC-1/-businesscard/g;s/-NETINST-1/-netinst/g' | \
-                gzip --best --no-name > $ARCHDIR/jigdo-cd/$NETINSTNAME.jigdo
-            rm $OUT/$BASE.jigdo
-            mv $OUT/$BASE.template $ARCHDIR/jigdo-cd/$NETINSTNAME.template
-            # Make sure that the ISO is as new/newer than the jigdo file; #587774
-            touch $ARCHDIR/iso-cd/$NETINSTNAME.iso
-	    mv $OUT/$BASE.list.gz $ARCHDIR/list-cd/$NETINSTNAME.list.gz
-        done
-        rm -f "$OUT"/*
-        END=`now`
-        mkdir -p "$PUBDIRJIG"/$OUTARCH
-        echo -e "start=$START\nend=$END\nerror=0\nlogfile=$RUN\n" > "$PUBDIRJIG"/$OUTARCH/$TRACEFILE
-
-    else
-
-        #######################################
-        # NORMAL STUFF - full builds (weekly)
-        #######################################
-
-        # finish up the jigdos (compress & move them)
-        gzip --best --no-name "$OUT"/*.jigdo
-        for i in "$OUT"/*.jigdo.gz; do
-            mv $i ${i%.gz}
-        done
-
-        # Make sure that the ISOs are as new/newer than the jigdo files; #587774
-	for file in "$OUT"/*.iso; do
-	    if [ -e $file ] ; then 
-		touch $file
-	    fi
-        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}
-            fi
-        done
-
-        mkdir -p "$PUBDIRJIG"/$OUTARCH/list-${OUT_TYPE}
-	mv "$OUT"/*list*gz "$PUBDIRJIG"/$OUTARCH/list-${OUT_TYPE}
-
-        END=`now`
-        echo -e "start=$START\nend=$END\nerror=0\nlogfile=$RUN\n" > "$PUBDIRJIG"/$OUTARCH/$TRACEFILE
-    fi
-
-    touch $TDIR/$CODENAME/1.pkgs_extracted # so we don't get errors below
-    for file in `cat $TDIR/$CODENAME/*.pkgs_extracted | sort | uniq`; do
-        basefile=`basename $file`
-        if [ ! -e $EXTRACTED_SOURCES/$file ] ; then
-            cp -a  $MIRROR/$file $EXTRACTED_SOURCES
-        fi
-    done
-
-    # Mail the sizes of the images
-    if [ -e "../.debian-cd.mail" ] ; then
-        MYEMAIL=`grep -v "^#" "../.debian-cd.mail"`
-    else
-        MYEMAIL=`whoami`
-    fi
-
-    for i in $MYEMAIL
-    do
-        grep -e "extents written" -e "Written to medi." "$LOGFILE"|mail -s "$RELEASE_BUILD testingcds $RUN ($OUTARCH $DISKTYPE) went ok" "$i"
-    done
-    overview "$RUN" success
-
-else
-    # Run failed
-    if [ -e "../.debian-cd.mail" ] ; then
-        MYEMAIL=`grep -v "^#" "../.debian-cd.mail"`
-    else
-        MYEMAIL=`whoami`
-    fi
-    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"
-    done
-    overview "$RUN" failed
-    END=`now`
-    mkdir -p "$PUBDIRJIG"/$OUTARCH
-    echo -e "start=$START\nend=$END\nerror=1\nlogfile=$RUN\n" > "$PUBDIRJIG"/$OUTARCH/$TRACEFILE
-    exit 1
+if ./build.sh $ARCH >>"$LOG/$INSTALLER_CD$DI$ARCH" 2>&1;then
+
+# if it went ok get things ready for publishing
+
+# we treat the netinst images in a different way
+
+if [ "$INSTALLER_CD" = "1" -o "$INSTALLER_CD" = "2" ]
+then
+
+# NETINST STUFF (ISO ONLY)
+
+# make the dirs we'll use to publish things
+  mkdir -p "$OUT"/$ARCH
+# rename the isos from .raw to .iso and put them in their place
+  for i in "$OUT"/*-1.raw
+  do
+    I=${i##*/}
+    if [ "$INSTALLER_CD" = "1" ];then
+      NETINSTNAME=${I%-binary-1.raw}-businesscard.iso
+    else
+      NETINSTNAME=${I%-binary-1.raw}-netinst.iso
+    fi
+    mv $i "$OUT"/$ARCH/$NETINSTNAME
+  done
+# change images names from raw to iso on the MD5SUMS
+  sed "s/[^ ]*-1.raw$/$NETINSTNAME/" "$OUT"/MD5SUMS >>"$OUT"/$ARCH/MD5SUMS
+# Publish the new version
+  mkdir -p "$PUBDIRISO"/$ARCH/$DATE
+  if [ -e "$PUBDIRISO"/$ARCH/$DATE/MD5SUMS ];then
+    grep -v $NETINSTNAME "$PUBDIRISO"/$ARCH/$DATE/MD5SUMS > "$PUBDIRISO"/$ARCH/$DATE/MD5SUMS.tmp
+  fi
+  cat "$OUT"/$ARCH/MD5SUMS >> "$PUBDIRISO"/$ARCH/$DATE/MD5SUMS.tmp
+  mv "$PUBDIRISO"/$ARCH/$DATE/MD5SUMS.tmp "$PUBDIRISO"/$ARCH/$DATE/MD5SUMS
+  mv "$OUT"/$ARCH/$NETINSTNAME "$PUBDIRISO"/$ARCH/$DATE/
+  rm -f "$PUBDIRISO"/$ARCH/current
+  ln -s $DATE "$PUBDIRISO"/$ARCH/current
+# Remove the oldest daily builds, leave only the last 3
+  NUM=`/bin/ls -d "$PUBDIRISO"/$ARCH/20*/|wc -l`
+  NUM=$(($NUM-3))
+  /bin/ls -d "$PUBDIRISO"/$ARCH/20*/|head -n $NUM|tr '\012' '\000'|xargs -0 /bin/rm -rf --
+
+else 
+
+# NORMAL STUFF, IE NORMAL ISO and JIGDO
+
+# ISO STUFF
+
+if [ "$DOJIGDO" != 2 ]
+then
+# make the dirs we'll use to publish things
+  mkdir -p "$OUT"/isos/$ARCH
+# rename the isos from .raw to .iso and put them in their place
+  for i in "$OUT"/*.raw
+  do
+    I=${i##*/}
+    mv $i "$OUT"/isos/$ARCH/${I%.raw}.iso
+  done
+# change images names from raw to iso on the MD5SUMS
+  sed 's/raw$/iso/' "$OUT"/MD5SUMS >"$OUT"/isos/$ARCH/MD5SUMS
+# Remove the old version and publish the new one
+  rm -rf "$PUBDIRISO"/isos/$ARCH/
+  mkdir -p "$PUBDIRISO"/isos/
+  mv "$OUT"/isos/$ARCH/ "$PUBDIRISO"/isos/$ARCH/
+fi
+
+# JIGDO STUFF
+
+if [ "$DOJIGDO" != 0 ]
+then
+# make the dirs we'll use to publish things
+  mkdir -p "$OUT"/jigdo-area/$ARCH/jigdotemplates
+# change images names from raw to iso on the MD5SUMS
+  sed 's/raw$/iso/' "$OUT"/MD5SUMS >"$OUT"/jigdo-area/$ARCH/MD5SUMS
+# put the templates aside
+  mv "$OUT"/*.template "$OUT"/jigdo-area/$ARCH/jigdotemplates
+# finish up the jigdos (compress & move them)
+  gzip --best --no-name "$OUT"/*.jigdo
+  for i in "$OUT"/*.jigdo.gz;do mv $i ${i%.gz};done
+  mv "$OUT"/*.jigdo "$OUT"/jigdo-area/$ARCH/
+# Remove the old version and publish the new one
+  if [ "$IMAGETARGET" = "official_images" ]
+  then
+    rm -rf "$PUBDIRJIG"/jigdo-area/source/
+    mkdir -p "$PUBDIRJIG"/jigdo-area/source/jigdotemplates/
+    mv "$OUT"/jigdo-area/$ARCH/*-source-*.jigdo "$PUBDIRJIG"/jigdo-area/source/
+    grep "source-.*.iso$" "$OUT"/jigdo-area/$ARCH/MD5SUMS > "$PUBDIRJIG"/jigdo-area/source/MD5SUMS
+    mv "$OUT"/jigdo-area/$ARCH/jigdotemplates/*-source-*.template "$PUBDIRJIG"/jigdo-area/source/jigdotemplates/
+    grep -v "source-.*.iso$" "$OUT"/jigdo-area/$ARCH/MD5SUMS > "$OUT"/jigdo-area/$ARCH/MD5SUMS.new
+    mv "$OUT"/jigdo-area/$ARCH/MD5SUMS.new "$OUT"/jigdo-area/$ARCH/MD5SUMS
+  fi
+  rm -rf "$PUBDIRJIG"/jigdo-area/$ARCH/
+  mkdir -p "$PUBDIRJIG"/jigdo-area/
+  mv "$OUT"/jigdo-area/$ARCH/ "$PUBDIRJIG"/jigdo-area/$ARCH/
+# Calculate snapshot path, remove the old snapshot and publish the new one
+#  SNAP=${JIGDOFALLBACKURLS##Debian=http://us.cdimage.debian.org/cdimage/}
+#  SNAP=${PUBDIRJIG%%testing*}${SNAP%%/Debian*}
+#  mkdir -p "$SNAP"
+#  mv "$OUT"/snapshot/* "$SNAP"
+# Remove the oldest snapshots, leave only the last 2
+#  NUM=`/bin/ls -d "${SNAP%%/$DATE}"/20*/|wc -l`
+#  NUM=$(($NUM-2))
+#  /bin/ls -d "${SNAP%%/$DATE}"/20*/|head -n $NUM|tr '\012' '\000'|xargs -0 /bin/rm -rf --
+fi
+
+fi
+
+# Mail the cd sizes of the cds
+if [ -e "../.debian-cd.mail" ]
+then
+  MYEMAIL=`grep -v "^#" "../.debian-cd.mail"`
+else
+  MYEMAIL=`whoami`
+fi
+  for i in $MYEMAIL
+  do
+    grep "extents written" "$LOG/$INSTALLER_CD$DI$ARCH"|mail -s "testingcds $INSTALLER_CD$DI$ARCH went ok" "$i"
+  done
+  overview "$INSTALLER_CD$DI$ARCH" success
+else
+if [ -e "../.debian-cd.mail" ]
+then
+  MYEMAIL=`grep -v "^#" "../.debian-cd.mail"`
+else
+  MYEMAIL=`whoami`
+fi
+  for i in $MYEMAIL
+  do
+    echo Error when trying to create cds for $INSTALLER_CD$DI$ARCH|mail -s "testingcds $INSTALLER_CD$DI$ARCH has failed" "$i"
+  done
+  overview "$INSTALLER_CD$DI$ARCH" failed
 fi

=== added directory 'data'
=== renamed directory 'data' => 'data.moved'
=== added directory 'data/artful'
=== added file 'data/artful/README.html.in'
--- data/artful/README.html.in	1970-01-01 00:00:00 +0000
+++ data/artful/README.html.in	2021-10-05 08:01:22 +0000
@@ -0,0 +1,663 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>Debian GNU/Linux -- The Universal Operating System</title>
+  <meta name="Description" content="Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.">
+  <meta name="Keywords" content="debian, GNU, linux, unix, open source, free, DFSG">
+  <meta name="Language" content="English">
+  <meta name="Author" content="J.A. Bezemer, [e-mail]">
+  <link rev="made" href="mailto:[e-mail]">
+</head>
+<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000">
+
+  <!-- The HTML and TEXT file are NOT the actual source code. -->
+  <!-- For that, see http://cvs.debian.org/debian-cd/data/woody/README.html.in?cvsroot=debian-boot -->
+#if 0
+        If you read THIS, you're viewing the actual source file ;-)
+#endif
+
+#undef i386
+#undef alpha
+#undef powerpc
+#undef ppc
+#undef sparc
+#undef ultrasparc
+#undef m68k
+#undef arm
+#undef binary
+#undef bin
+#undef source
+#undef src
+
+#if OUTPUTtext
+#define	  href  nothing
+#endif
+
+#include <README.diskdefines>
+
+
+#if OUTPUThtml
+<div align=right>
+(<a href="README.txt">Text version</a>)
+</div>
+<table border="0" cellpadding="3" cellspacing="0" align="center" summary="">
+<tr>
+<td>
+<img src="pics/logo-50.jpg" border="0" hspace="0" vspace="0" alt="" width="50" height="61">
+<img src="pics/debian.jpg" border="0" hspace="0" vspace="0" alt="Debian" width="179" height="61">
+</td>
+</tr>
+</table>
+#endif 
+#if OUTPUTtext
+<div align=right>
+(HTML version in README.html)
+</div>
+#endif
+
+
+<table bgcolor="#DF0451" border="0" cellpadding="0" cellspacing="0"
+  width="100%" summary="">
+<tr>
+<td valign="top">
+<img src="pics/red-upperleft.png" align="left" border="0" hspace="0"
+  vspace="0" alt="" width="15" height="16">
+</td>
+<td rowspan="2" align="center">
+
+ <table align="center" border="0" cellpadding="2" cellspacing="0">
+ <tr><td bgcolor="#000084">
+ <div align="center"><font color="#FFFFFF" face="helvetica,arial"><B>&nbsp;&nbsp;
+#if 0
+ Debian GNU/Linux 2.2 "Potato" - Official i386 Binary-1 CD
+#endif
+ DISKNAME CD
+ &nbsp;&nbsp;</B></font></div>
+ </td></tr>
+ </table>
+
+</td>
+<td valign="top">
+<img src="pics/red-upperright.png" align="right" border="0" hspace="0"
+  vspace="0" alt="" width="16" height="16">
+</td>
+</tr>
+<tr>
+<td valign="bottom">
+<img src="pics/red-lowerleft.png" align="left" border="0" hspace="0"
+  vspace="0" alt="" width="16" height="16">
+</td>
+<td valign="bottom">
+<img src="pics/red-lowerright.png" align="right" border="0" hspace="0"
+vspace="0" alt="" width="15" height="16">
+</td>
+</tr>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%" summary="">
+<tr>
+        <td></td>
+</tr>
+</table>
+
+
+<table border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+<tr>
+        <td colspan="3" valign="top" width="20%" bgcolor="#BBDDFF">
+          <img src="pics/blue-upperleft.png" align="left" border="0"
+            hspace="0" vspace="0" alt="" width="16" height="16">
+          <img src="pics/blue-upperright.png" align="right" border="0"
+            hspace="0" vspace="0" alt="" width="16" height="16">
+        </td>
+</tr>
+<tr>
+        <td bgcolor="#BBDDFF">&nbsp;&nbsp;</td>
+
+        <td valign="TOP" bgcolor="#BBDDFF">
+
+<font face="Arial,Helvetica">
+
+#if OUTPUThtml
+<P><B><A href="http://www.debian.org/">Debian home&nbsp;page</A></B></P>
+#endif
+
+&nbsp;<br>
+<P>
+
+#if OUTPUTtext
+&nbsp;<br>
+CONTENTS:
+<br>
+&nbsp;<br>
+<UL>
+#endif
+
+#if OUTPUTtext
+<LI>
+#endif
+
+<A href="#intro">Intro</A>
+<P>
+
+#if OUTPUTtext
+</LI><LI>
+#endif
+
+<A href="#thiscd">About This CD</A>
+<P>
+
+#if OUTPUTtext
+</LI><LI>
+#endif
+
+<A href="#install">Installing</A>
+<P>
+
+#if OUTPUTtext
+</LI><LI>
+#endif
+
+#ifndef UNOFFEXTRAS
+<A href="#lastmin">Last-Minute Notes</A>
+<P>
+
+#if OUTPUTtext
+</LI><LI>
+#endif
+#endif
+
+#if TYPEbinary
+ <A href="#apt">Using CDs with apt</A>
+ <P>
+
+#if OUTPUTtext
+  </LI><LI>
+#endif
+#endif
+
+#ifndef UNOFFEXTRAS
+<A href="#cdmanuf">CD Manufacturers</A>
+<P>
+
+#if OUTPUTtext
+</LI><LI>
+#endif
+#endif
+
+<A href="#other">More Information</A>
+
+<P>
+
+#if OUTPUThtml
+&nbsp;<P>
+<A href=".">Browse this CD-ROM</A></P>
+<P>
+<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt>
+</P>
+#endif
+
+
+</font>
+
+#if OUTPUTtext
+</LI>
+</UL>
+#endif
+
+
+        </td>
+        <td bgcolor="#BBDDFF">&nbsp;&nbsp;</td>
+        <td>&nbsp;&nbsp;</td>
+
+  <td valign="TOP" width="80%">
+
+<div align="center">
+<big><big><B><I>
+Welcome to the exciting world of
+</I></B></big></big>
+<br>
+<big><big><big><B><I>
+Debian GNU/Linux!
+</I></B></big></big></big>
+</div>
+
+<P><H2><A name="intro">
+Intro
+#if OUTPUTtext
+<br>
+=====
+#endif
+</H2>
+</a>
+<p>
+This is one of the CD-ROMs of the
+<a href="http://www.debian.org/">Debian GNU/Linux</a>
+distribution. Debian is a
+very extensive collection of software. But it is more. It is a complete
+Operating System (OS) for your computer. And it is
+<A href="http://www.debian.org/intro/free">free</A>
+(as in &quot;freedom&quot;).
+<P>
+An operating system is the set of basic programs
+and utilities that make your computer run. At the core of an operating
+system is the kernel. The kernel is the most fundamental program on the
+computer, which does all the basic housekeeping and lets you start other
+programs.
+Debian is kernel independent. It currently uses the
+<A href="http://www.linux.org/">Linux</A> kernel but work is
+in progress to provide Debian for other kernels, using
+<A href="http://www.gnu.org/software/hurd/hurd.html">the Hurd</A>.
+Most of the basic operating system tools
+come from the <a href="http://www.gnu.org/">GNU project</A>; hence the name
+GNU/Linux.
+<P>
+
+Debian is available for various kinds of computers
+(&quot;architectures&quot;), like
+&quot;IBM-compatible&quot; PCs (<i>i386</i>),
+Compaq's <i>Alpha</i>,
+Motorola's 680x0 (<i>m68k</i>),
+Sun's <i>Sparc</i>,
+Motorola/IBM's <i>PowerPC</i>, and <i>(Strong)ARM</i> processors.
+Check the <A href="http://www.debian.org/ports">ports</A> page
+#if OUTPUTtext
+(http://www.debian.org/ports)
+#endif
+for more information.
+<P>
+
+#if OUTPUTtext
+Read more at <P>
+&nbsp; http://www.debian.org/intro/about
+#endif
+#if OUTPUThtml
+<A href="http://www.debian.org/intro/about">Read more...</A>
+#endif
+
+#if OUTPUTtext
+<P>&nbsp;<P><H2><A name="thiscd">
+#endif
+#if OUTPUThtml
+<P><HR><P><H2><A name="thiscd">
+#endif
+About This CD
+#if OUTPUTtext
+<br>
+=============
+#endif
+</H2>
+</a>
+<p>
+This CD-ROM is labeled
+<P>
+<tt>&nbsp;
+  DISKNAME
+</tt>
+<P>
+#ifndef UNOFFEXTRAS
+which means that this CD is number DISKNUM of TOTALNUM CDs containing
+#if TYPEbinary
+programs ("binaries") for `ARCH' computers.
+<P>
+The programs on the Binary CDs are ordered by popularity. The Binary-1 CD
+contains the most popular programs and the installation tools; it is possible
+to install and run Debian with only the Binary-1 CD. The other CDs, up to
+Binary-TOTALNUM, contain mostly special-interest programs.
+#endif
+#if TYPEsource
+the source code of programs in the Debian OS.
+<P>
+The source packages on the Source CDs are ordered by popularity, like
+the programs on the Binary CDs. This means that the source code of the
+programs on the Binary-DISKNUM CD can most likely be found on this CD
+(though there may be some variation due to size issues).
+#endif
+#else
+#include <unoffextrascd.html.in>
+#endif
+
+
+#if OUTPUTtext
+<P>&nbsp;<P><H2><A name="install">
+#endif
+#if OUTPUThtml
+<P><HR><P><H2><A name="install">
+#endif
+Installing
+#if OUTPUTtext
+<br>
+==========
+#endif
+</H2>
+</a>
+<p>
+#if TYPEbinary
+
+ Because Debian is a complete Operating System, the installation procedure
+ may seem a bit unusual. You can install Debian GNU/Linux either
+ <i>next to</i> your current OS, or as <i>only</i> OS on your computer.
+
+ <P>
+ Read the <i>Installation Manual</i>, on this CD at
+ <P>
+ <tt>&nbsp;
+ <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; </tt>
+ <P>
+ Programs and other files that are needed for the installation can be found on
+ this CD under
+ <P>
+ <tt>&nbsp;
+ <A href=%%""tools/%%"">/tools/</a>
+ </tt>
+ and
+ <tt>&nbsp;
+ <A href=%%""install/floppy/%%"">/install/floppy/</a>
+ </tt>
+
+#if ARCHi386 || ARCHalpha || ARCHpowerpc || ARCHsparc
+  <P>
+  For the impatient ones:
+#endif
+
+#if ARCHi386 || ARCHalpha || ARCHsparc
+  you can start the installation program easily by booting off this CD-ROM.
+  Note that not all (esp. older) systems support this. 
+  <P>
+#endif
+
+#if ARCHi386 || ARCHpowerpc
+#if ARCHi386
+   You can also
+#else
+   you can
+#endif
+  examine the
+  <P>
+  <tt>&nbsp;
+  <a href="install/">/install</a>
+  </tt>
+  <P>
+  directory; you might be able to start the installation system directly
+  from there. 
+#endif
+
+#else
+ The installation tools of the Debian Operating System are located on the
+ Binary-1 CD.
+ See the README on that CD for more info.
+#endif
+
+#ifndef UNOFFEXTRAS
+#if OUTPUTtext
+<P>&nbsp;<P><H2><A name="lastmin">
+#endif
+#if OUTPUThtml
+<P><HR><P><H2><A name="lastmin">
+#endif
+Last-Minute Notes
+#if OUTPUTtext
+<br>
+=================
+#endif
+</H2>
+</a>
+<p>
+<UL>
+
+<LI>
+You should keep in mind that this is an unofficial CD of the current
+development version of the Debian system. This means that all sorts of
+bugs may be present anywhere in the system.
+
+<br>&nbsp;
+</LI>
+
+#if 0
+-------- This can't be an official image, so also no official notes.
+<LI>
+Last-minutes notes for this CD may be available on
+<a href="http://www.debian.org/CD/releases/">http://www.debian.org/CD/releases/</a>
+</LI>
+#endif
+
+</UL>
+#endif
+
+#if TYPEbinary
+#if OUTPUTtext
+  <P>&nbsp;<P><H2><A name="apt">
+#endif
+#if OUTPUThtml
+  <P><HR><P><H2><A name="apt">
+#endif
+ Using Apt
+#if OUTPUTtext
+  <br>
+  =============
+#endif
+ </H2>
+ </a>
+ <p>
+ After installing or upgrading, Debian's packaging system can use CD-ROMs,
+ local collections, or networked servers (FTP, HTTP) to automatically
+ install software from (<tt>.deb</tt> <i>packages</i>). This is done
+ preferably with the `apt' and `aptitude' programs. 
+
+ <P>
+
+ You can install packages from the commandline using
+ <tt>apt-get</tt>. For example, if you want to install the packages
+ `commprog' and `maxgame', you can give the command
+ <P>
+ <tt>&nbsp;
+   apt-get install commprog maxgame
+ </tt>
+ <P>
+ Note that you don't have to enter the complete path, or the
+ `<tt>.deb</tt>' extension. `Apt' will figure this out itself. 
+ <P>
+ Or use aptitude for a full screen interactive selection of available
+ Debian packages.
+ 
+#endif
+
+
+#ifndef UNOFFEXTRAS
+#if OUTPUTtext
+<P>&nbsp;<P><H2><A name="cdmanuf">
+#endif
+#if OUTPUThtml
+<P><HR><P><H2><A name="cdmanuf">
+#endif
+CD Manufacturers
+#if OUTPUTtext
+<br>
+================
+#endif
+</H2>
+</a>
+<p>
+You are completely free to manufacture and re-distribute CD-ROMs of the
+Debian GNU/Linux Operating System, like this one. There is no charge from
+us (but of course donations are always welcome). 
+
+<P>
+
+For all needed information and contact addresses, please refer to
+<P>
+<tt>&nbsp;
+  <a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a>
+</tt>
+#endif
+
+#if OUTPUTtext
+<P>&nbsp;<P><H2><A name="other">
+#endif
+#if OUTPUThtml
+<P><HR><P><H2><A name="other">
+#endif
+More Information
+#if OUTPUTtext
+<br>
+================
+#endif
+</H2>
+</a>
+<p>
+#if DISKNUM1 && TYPEbinary
+
+There is much more information present on this CD. Besides the already
+mentioned installation and upgrading procedures, this is the most
+interesting:  <P>
+
+<UL>
+<LI>
+
+#if OUTPUTtext
+/doc/FAQ
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="doc/FAQ/">Debian FAQ</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+/doc/constitution.txt
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="doc/constitution.txt">The Debian Constitution</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+/doc/debian-manifesto
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="doc/debian-manifesto">The Debian Manifesto</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+/doc/social-contract.txt
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="doc/social-contract.txt">Debian's Social Contract</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+/doc/bug-reporting.txt
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="doc/bug-reporting.txt">Bug reporting instructions</a>
+
+</LI>
+</UL>
+
+#else
+
+The Binary-1 CD contains much more information about various aspects
+of the Debian Operating System and the Debian organization.
+ See the README on that CD for more info.
+
+#endif
+
+<P>
+Also on the Internet are many resources. To name a few:
+<P>
+
+<UL>
+<LI>
+
+#if OUTPUTtext
+http://www.debian.org
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="http://www.debian.org/">The Debian homepage</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+http://www.debian.org/doc
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="http://www.debian.org/doc/">Debian Documentation</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+http://www.debian.org/support
+ &nbsp;
+#endif
+<A href="http://www.debian.org/support">Debian User Support</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+http://www.tldp.org
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="http://www.tldp.org/">The Linux Documentation Project</a>
+
+</LI>
+<LI>
+
+#if OUTPUTtext
+http://www.linux.org
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+#endif
+<A href="http://www.linux.org/">General Linux homepage</a>
+
+</LI>
+</UL>
+
+<P>
+
+<DIV align="center">
+
+#if OUTPUTtext
+&nbsp;<br>
+&nbsp;<br>
+#endif
+#if OUTPUThtml
+<HR>
+#endif
+
+<SMALL>See the Debian
+<A href="http://www.debian.org/contact">contact page</A>
+
+#if OUTPUTtext
+(http://www.debian.org/contact)
+#endif
+
+for information on contacting us.
+	</SMALL><P>
+<SMALL>
+
+Last Modified:  Sat Mar 20 12:30:45 EST 2004
+
+<br></SMALL>
+</DIV>
+
+  </td>
+  </tr>
+  <tr>
+        <td colspan="3" valign="bottom" width="20%" bgcolor="#BBDDFF">
+          <img src="pics/blue-lowerleft.png" align="left" border="0"
+            hspace="0" vspace="0" alt="" width="17" height="16">
+          <img src="pics/blue-lowerright.png" align="right" border="0"
+            hspace="0" vspace="0" alt="" width="16" height="16">
+        </td>
+  </tr>
+  </table>
+
+</body>
+</html>

=== added file 'data/artful/README.sbm'
--- data/artful/README.sbm	1970-01-01 00:00:00 +0000
+++ data/artful/README.sbm	2021-10-05 08:01:22 +0000
@@ -0,0 +1,43 @@
+About the Smart Boot Manager image
+----------------------------------
+
+  The file `sbm.bin' that is available in this directory may be useful
+  to you if you are not able to directly boot the first CD because your
+  BIOS may be too old and may not support ISOLINUX.
+
+  Then, instead of booting on the CD directly, you create a Smart Boot
+  Manager floppy image by using the sbm.bin disk image. You can create this
+  floppy with rawrite (under DOS) or with dd (under Linux). Now you can
+  boot on this floppy disk and it will detect your CDROM and let you boot
+  on it bypassing any BIOS limitation.
+
+What is SBM ?
+
+  Smart Boot Manager or briefly SmartBtmgr (SBM), is an OS independent
+  Boot Manager - a program that is loaded by the bios before any
+  operating system and allows you to choose which operating system to
+  boot.
+
+  SBM is included in Debian in two ways, the package bmconf allows us to
+  install and configure an old version of SBM and sbm wich is the latest
+  version of SBM with an installer.
+
+What's the use of SBM on the CD then ?
+
+  SBM includes an IDE driver that allows us to boot the cds even on
+  machines with a BIOS that wouldn't support booting from CD, provided our
+  CDROM is an IDE one, that is, so you can make a SBM floppy and boot from
+  it and then tell it to boot from your CDROM.
+
+  Also, there are some cases where the BIOS would allow booting from the CD
+  but isolinux fails to boot from there, in this case you can either boot
+  using a CD other than the first, as the others don't use isolinux, or you
+  can make a SBM floppy and boot from this floppy and then tell SBM to boot
+  your CDROM.
+
+How do you make a SBM floppy ?
+
+  If you have SBM installed on a box you can run sbminst. Otherwise you can
+  put the sbm.bin floppy image that we provide with our cds onto a floppy
+  just like you would do with a rescue image.
+

=== added file 'data/artful/access-new.pcx'
Binary files data/artful/access-new.pcx	1970-01-01 00:00:00 +0000 and data/artful/access-new.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/access.pcx'
Binary files data/artful/access.pcx	1970-01-01 00:00:00 +0000 and data/artful/access.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/amd64_udeb_include'
--- data/artful/amd64_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/amd64_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb

=== added file 'data/artful/blank.pcx'
Binary files data/artful/blank.pcx	1970-01-01 00:00:00 +0000 and data/artful/blank.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/edubuntu.pcx'
Binary files data/artful/edubuntu.pcx	1970-01-01 00:00:00 +0000 and data/artful/edubuntu.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/edubuntu.png'
Binary files data/artful/edubuntu.png	1970-01-01 00:00:00 +0000 and data/artful/edubuntu.png	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/exclude-udebs'
--- data/artful/exclude-udebs	1970-01-01 00:00:00 +0000
+++ data/artful/exclude-udebs	2021-10-05 08:01:22 +0000
@@ -0,0 +1,1 @@
+kernel-image-*

=== added file 'data/artful/gobuntu.pcx'
Binary files data/artful/gobuntu.pcx	1970-01-01 00:00:00 +0000 and data/artful/gobuntu.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/gobuntu.png'
Binary files data/artful/gobuntu.png	1970-01-01 00:00:00 +0000 and data/artful/gobuntu.png	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/i386_businesscard_udeb_include'
--- data/artful/i386_businesscard_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/i386_businesscard_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,5 @@
+choose-mirror
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb

=== added file 'data/artful/i386_netinst_udeb_include'
--- data/artful/i386_netinst_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/i386_netinst_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb

=== added file 'data/artful/i386_udeb_include'
--- data/artful/i386_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/i386_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb

=== added file 'data/artful/kubuntu-access.pcx'
Binary files data/artful/kubuntu-access.pcx	1970-01-01 00:00:00 +0000 and data/artful/kubuntu-access.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/kubuntu-blank.pcx'
Binary files data/artful/kubuntu-blank.pcx	1970-01-01 00:00:00 +0000 and data/artful/kubuntu-blank.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/kubuntu.pcx'
Binary files data/artful/kubuntu.pcx	1970-01-01 00:00:00 +0000 and data/artful/kubuntu.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/kubuntu.png'
Binary files data/artful/kubuntu.png	1970-01-01 00:00:00 +0000 and data/artful/kubuntu.png	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/lubuntu.pcx'
Binary files data/artful/lubuntu.pcx	1970-01-01 00:00:00 +0000 and data/artful/lubuntu.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/lubuntu.png'
Binary files data/artful/lubuntu.png	1970-01-01 00:00:00 +0000 and data/artful/lubuntu.png	2021-10-05 08:01:22 +0000 differ
=== added directory 'data/artful/multiarch'
=== added file 'data/artful/multiarch/amd64'
--- data/artful/multiarch/amd64	1970-01-01 00:00:00 +0000
+++ data/artful/multiarch/amd64	2021-10-05 08:01:22 +0000
@@ -0,0 +1,1 @@
+i386

=== added file 'data/artful/mythbuntu.pcx'
Binary files data/artful/mythbuntu.pcx	1970-01-01 00:00:00 +0000 and data/artful/mythbuntu.pcx	2021-10-05 08:01:22 +0000 differ
=== added file 'data/artful/mythbuntu.png'
Binary files data/artful/mythbuntu.png	1970-01-01 00:00:00 +0000 and data/artful/mythbuntu.png	2021-10-05 08:01:22 +0000 differ
=== added directory 'data/artful/pegasos'
=== added file 'data/artful/pegasos/pegasos'
--- data/artful/pegasos/pegasos	1970-01-01 00:00:00 +0000
+++ data/artful/pegasos/pegasos	2021-10-05 08:01:22 +0000
@@ -0,0 +1,84 @@
+\ FORTH is identifed by a forth comment at first line
+\
+\ terminal control stuff
+\
+: TTY.CSI d# 27 EMIT ASCII [ EMIT ;
+: TTY.HOME    TTY.CSI ASCII H EMIT ;
+: TTY.CLR_EOS TTY.CSI ASCII J EMIT ;
+: TTY.HOME_CLR TTY.HOME TTY.CLR_EOS ;
+\
+\ boot menu stuff
+\
+: my-max-boot-num 3 ;
+: my-boot-default 1 ;
+: my-boot-delay d# 300 ; \ unit = 100 ms
+: my-print-menu ( -- )
+  TTY.HOME_CLR
+  ."  "                                    			cr
+  ." Welcome to Ubuntu ${DEBIAN_VERSION}!"			cr
+  ." "								cr
+  ." This is an Ubuntu installation ${MEDIA_TYPE},"		cr
+  ." built on ${BUILD_DATE}."					cr
+  ." "								cr
+  ." The default option is (1) 'install'."			cr
+  ." "								cr
+  ." ************************************"			cr
+  ." If in doubt, just choose (1) 'install'"			cr
+  ." ************************************"			cr
+  ."  "								cr
+  ." 1: install"   						cr
+  ." 2: return to OF prompt"					cr
+  ."  "								cr
+;
+: my-boot-case ( num -- )
+  ."  " cr
+  case
+    1 of " cd install/powerpc/vmlinuz-chrp.initrd --" endof
+    2 of " none" endof
+  endcase
+  $boot
+;
+: my-input-num ( wait-period max-boot-num default-num -- boot-num )
+  1 \ loop-inc = 1
+  3 pick 0 do
+    0d emit
+    ." press 1-"
+    ( wait-period max-boot-num default-num loop-inc )
+    2 pick ascii 0 + emit
+    dup 1 = if
+      ."  within "
+      3 pick i - d# 10 / .d
+      ."  seconds"
+    then
+    ."  (default: "
+    over ascii 0 + emit
+    ." ) :                   "
+    d# 100 ms
+    key? if
+       key
+       ( wait-period max-boot-num default-num loop-inc key )
+       dup 0d = if \ return pressed
+         drop leave
+       then
+
+       ascii 0 -
+       ( wait-period max-boot-num default-num loop-inc num )
+       dup 1 5 pick
+       ( wait-period max-boot-num default-num loop-inc num num 1 max-boot-num )
+       between if
+         rot drop swap leave
+       then
+
+       ( wait-period max-boot-num default-num loop-inc num )
+       2drop 0  \ loop-inc = 0
+    then
+  dup +loop
+  drop
+  ( wait-period max-boot-num boot-num )
+  nip nip
+;
+
+
+my-print-menu
+my-boot-delay my-max-boot-num my-boot-default my-input-num
+my-boot-case

=== added file 'data/artful/powerpc_businesscard_udeb_include'
--- data/artful/powerpc_businesscard_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/powerpc_businesscard_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+wireless-tools-udeb

=== added file 'data/artful/powerpc_netinst_udeb_include'
--- data/artful/powerpc_netinst_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/powerpc_netinst_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+wireless-tools-udeb

=== added file 'data/artful/powerpc_udeb_include'
--- data/artful/powerpc_udeb_include	1970-01-01 00:00:00 +0000
+++ data/artful/powerpc_udeb_include	2021-10-05 08:01:22 +0000
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb

=== added directory 'data/artful/preseed'
=== added file 'data/artful/preseed/cli.seed'
--- data/artful/preseed/cli.seed	1970-01-01 00:00:00 +0000
+++ data/artful/preseed/cli.seed	2021-10-05 08:01:22 +0000
@@ -0,0 +1,6 @@
+# Only install the standard system and language packs.
+tasksel	tasksel/first	multiselect
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+d-i	pkgsel/language-pack-patterns	string
+# No language support packages.
+d-i	pkgsel/install-language-support	boolean false

=== added directory 'data/artful/preseed/edubuntu'
=== added file 'data/artful/preseed/edubuntu/cli.seed'
--- data/artful/preseed/edubuntu/cli.seed	1970-01-01 00:00:00 +0000
+++ data/artful/preseed/edubuntu/cli.seed	2021-10-05 08:01:22 +0000
@@ -0,0 +1,9 @@
+# Adjust the default hostname.
+d-i	netcfg/get_hostname	string edubuntu
+d-i	netcfg/get_hostname	seen false
+# Only install the standard system and language packs.
+tasksel	tasksel/first	multiselect
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+d-i	pkgsel/language-pack-patterns	string
+# No language support packages.
+d-i	pkgsel/install-language-support	boolean false

=== added file 'data/artful/preseed/edubuntu/edubuntu.seed'
--- data/artful/preseed/edubuntu/edubuntu.seed	1970-01-01 00:00:00 +0000
+++ data/artful/preseed/edubuntu/edubuntu.seed	2021-10-05 08:01:22 +0000
@@ -0,0 +1,15 @@
+# Adjust the default hostname.
+d-i	netcfg/get_hostname	string edubuntu
+d-i	netcfg/get_hostname	seen false
+# Enable extras.ubuntu.com.
+d-i	apt-setup/extras	boolean true
+# Install the Edubuntu desktop.
+tasksel	tasksel/first	multiselect ubuntu-desktop, edubuntu-desktop-gnome
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+# Install both GNOME and KDE translation packages.
+d-i	pkgsel/language-pack-patterns	string language-pack-gnome-$LL language-pack-kde-$LL kde-i18n-$LL
+# On live DVDs, don't spend huge amounts of time removing substantial
+# application packages pulled in by language packs. Given that we clearly
+# have the space to include them on the DVD, they're useful and we might as
+# well keep them installed.
+ubiquity	ubiquity/keep-installed	string icedtea6-plugin openoffice.org

=== added file 'data/artful/preseed/edubuntu/ltsp.seed'
--- data/artful/preseed/edubuntu/ltsp.seed	1970-01-01 00:00:00 +0000
+++ data/artful/preseed/edubuntu/ltsp.seed	2021-10-05 08:01:22 +0000
@@ -0,0 +1,12 @@
+# Build an LTSP client chroot.
+d-i	anna/choose_modules	string ltsp-client-builder
+d-i	ltsp-client-builder/run	boolean true
+# Enable extras.ubuntu.com.
+d-i	apt-setup/extras	boolean true
+# Install the Ubuntu desktop and LTSP server.
+tasksel	tasksel/first	multiselect ubuntu-desktop, edubuntu-desktop-gnome
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+d-i	pkgsel/include/install-recommends	boolean true
+d-i	pkgsel/include	string ltsp-server-standalone openssh-server
+# Build a client chroot.
+d-i	preseed/late_command	string chroot /target /usr/sbin/ltsp-update-sshkeys

=== added file 'data/artful/preseed/edubuntu/workstation.seed'
--- data/artful/preseed/edubuntu/workstation.seed	1970-01-01 00:00:00 +0000
+++ data/artful/preseed/edubuntu/workstation.seed	2021-10-05 08:01:22 +0000
@@ -0,0 +1,10 @@
+# Adjust the default hostname.
+d-i	netcfg/get_hostname	string edubuntu
+d-i	netcfg/get_hostname	seen false
+# Enable extras.ubuntu.com.
+d-i	apt-setup/extras	boolean true
+# Install the Edubuntu desktop.
+tasksel	tasksel/first	multiselect ubuntu-desktop, edubuntu-desktop-gnome
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+# Install both GNOME and KDE translation packages.
+d-i	pkgsel/language-pack-patterns	string language-pack-gnome-$LL language-pack-kde-$LL kde-i18n-$LL

=== added directory 'data/artful/preseed/jeos'
=== added file 'data/artful/preseed/jeos/jeos.seed'
--- data/artful/preseed/jeos/jeos.seed	1970-01-01 00:00:00 +0000
+++ data/artful/preseed/jeos/jeos.seed	2021-10-05 08:01:22 +0000