[debian-edu-commits] r84034 - trunk/src/build/CD-administrator

holger at alioth.debian.org holger at alioth.debian.org
Mon Oct 20 12:28:49 UTC 2014


Author: holger
Date: 2014-10-20 12:28:49 +0000 (Mon, 20 Oct 2014)
New Revision: 84034

Added:
   trunk/src/build/CD-administrator/CONF-jessie-source-usbstick.sh
Removed:
   trunk/src/build/CD-administrator/CONF-jessie-source-dvd.sh
Modified:
   trunk/src/build/CD-administrator/Makefile
Log:
rename jessie-source-dvd to jessie-source-usbstick

Deleted: trunk/src/build/CD-administrator/CONF-jessie-source-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-jessie-source-dvd.sh	2014-10-20 12:23:12 UTC (rev 84033)
+++ trunk/src/build/CD-administrator/CONF-jessie-source-dvd.sh	2014-10-20 12:28:49 UTC (rev 84034)
@@ -1,398 +0,0 @@
-#
-# 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 SECURED           || true
-unset SECURITY          || 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 NORECOMMENDS      || true
-unset NOSUGGESTS        || true
-unset DOJIGDO           || true
-unset JIGDOCMD          || true
-unset JIGDOTEMPLATEURL  || true
-unset JIGDOFALLBACKURLS || true
-unset JIGDOINCLUDEURLS  || true
-unset JIGDOSCRIPT       || 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 SPLASHPNG         || true
-unset OMIT_RELEASE_NOTES || true
-unset SUITE || true
-unset SOURCEONLY || true
-unset LOGOPNG		|| true
-unset MAX_PKG_SIZE       || true
-
-# The debian-cd dir
-# Where I am (hoping I'm in the debian-cd dir)
-export BASEDIR=`pwd`
-
-# Set where to find the mirrors and where to store the temp files
-export TOPDIR=/skolelinux/administrator
-
-# Building this cd set ...
-export CODENAME=jessie
-
-# Using these local packages
-export LOCALCODE=jessie
-
-# By default use Debian installer packages from $CODENAME
-if [ ! "$DI_CODENAME" ]
-then
-  export DI_CODENAME=$CODENAME
-fi
-
-# If set, controls where the d-i components are downloaded from.
-# This may be an url, or "default", which will make it use the default url
-# for the daily d-i builds. If not set, uses the official d-i images from
-# the Debian mirror.
-#export DI_WWW_HOME=default
-
-# Version number, "2.2 r0", "2.2 r1" etc.
-export DEBVERSION="8.0+edu0~a0"
-
-# 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_DPKG_CPU 2>/dev/null || true`
-#        if [ -z "$CPU" ]; then
-#                CPU=`dpkg-architecture -qDEB_HOST_ARCH`
-#        fi
-#        KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_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
-
-ARCHES="source"
-export ARCHES
-
-# 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
-#	      takes a lot of extra room to create the sandbox for the ISO
-#	      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=$TOPDIR/debmirror/debian/debian
-
-# 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=$TOPDIR/debmirror/builder_temp_dir/jessie-source-dvd
-
-# Path where the images will be written
-export OUT=$TDIR/CD/jessie-source-dvd
-
-# Where we keep the temporary apt stuff.
-# This cannot reside on an NFS mount.
-export APTTMP=$TDIR/apt
-
-# 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
-
-# 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
-
-# If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with 
-# local packages that you want to put on the CD set then
-# uncomment the following line 
-#export LOCAL=1
-
-# 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
-# use local-mirror mirror for local
-#export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/local-mirror
-# use morror-link for local-test
-#export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/mirror-link
-
-# 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
-
-# Where to find the security patches.  This directory should be the
-# top directory of a security.debian.org mirror.
-export SECURITY="$TOPDIR"/debmirror/debian/debian-security
-
-# Sparc only : bootdir (location of cd.b and second.b)
-# export BOOTDIR=/boot
-
-# Symlink farmers should uncomment this line :
-# export SYMLINK=1
-
-# Use this to force copying the files instead of symlinking or hardlinking
-# them. This is useful if your destination directories are on a different
-# partition than your source files.
-export COPYLINK=0
-
-# Options
-# export MKISOFS=/usr/bin/mkisofs
-# export MKISOFS_OPTS="-r"		#For normal users
-# export MKISOFS_OPTS="-r -F ."	#For symlink farmers
-
-# ISOLinux support for multiboot on CD1 for i386
-export ISOLINUX=0
-
-# 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=2000000000 # 1.86 GiB
-
-# 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 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
-# CUSTOM:            up to you - specify a size to go with it (in 2K blocks)
-#export DISKTYPE=CD
-#export DISKTYPE=DVD
-export DISKTYPE=CUSTOM
-export CUSTOMSIZE=7864320 # 15 GiB
-
-# We don't want certain packages to take up space on CD1...
-#export EXCLUDE="$BASEDIR"/tasks/exclude-sarge
-#export EXCLUDE="$BASEDIR"/tasks/exclude-etch
-# ...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
-
-# Set this if the recommended packages should be skipped when adding 
-# 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 and SHA1 sums for generated images
-export IMAGESUMS=1
-
-# 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 by piping mkisofs directly into jigdo-file,
-#     no temporary iso image is created (saves lots of disk space).
-#     NOTE: The no-temp-iso will not work for (at least) alpha and powerpc
-#     since they need the actual .iso to make it bootable. For these archs,
-#     the temp-iso will be generated, but deleted again immediately after the
-#     jigdo stuff is made; needs temporary space as big as the biggest image.
-#export DOJIGDO=2
-#
-# jigdo-file command & options
-# Note: building the cache takes hours, so keep it around for the next run
-#export JIGDOCMD="/usr/local/bin/jigdo-file --cache=$HOME/jigdo-cache.db"
-#
-# 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
-# correct. If it is non-empty, it needs a trailing slash. "%ARCH%"
-# will be substituted by the current architecture.
-#export JIGDOTEMPLATEURL=""
-#
-# Name of a directory on disc to create data for a fallback server in. 
-# Should later be made available by you at the URL given in
-# JIGDOFALLBACKURLS. In the directory, two subdirs named "Debian" and
-# "Non-US" will be created, and filled with hard links to the actual
-# files in your FTP archive. Because of the hard links, the dir must
-# be on the same partition as the FTP archive! If unset, no fallback
-# data is created, which may cause problems - see README.
-#export JIGDOFALLBACKPATH="$(OUT)/snapshot/"
-#
-# 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/"
-#
-# 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"
-#
-# $JIGDOTEMPLATEURL and $JIGDOINCLUDEURLS are passed to
-# "tools/jigdo_header", which is used by default to generate the
-# [Image] and [Servers] sections of the .jigdo file. You can provide
-# your own script if you need the .jigdo file to contain different
-# data.
-#export JIGDOSCRIPT="myscript"
-
-# Set to 1 to generate MD5 and SHA1 sums for generated images
-#export IMAGESUMS=1
-
-# 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/"
-
-# 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.
-# Lines starting with '#' are comments.  The package order is
-# important, as the packages will be installed in the given order.
-#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/udeb_include
-#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/${ARCHES}_udeb_include
-
-# File with list of packages to exclude as above.
-#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/udeb_exclude
-#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/exclude-udebs-$ARCHES
-
-# File with list of packages to include when running debootstrap from
-# the first stage installer (currently only supported in
-# debian-installer). One package per line.  Lines starting with '#'
-# are comments.  The package order is important, as the packages will
-# be installed in the given order.
-#export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include
-
-# 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).
-# INSTALLER_CD=0: nothing special (default)
-# 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
-
-export TASK=Debian-edu-netinst
-
-# Parameters to pass to kernel when the CD boots. Not currently supported
-# for all architectures.
-#export KERNEL_PARAMS="quiet"
-
-# Enable graphical installer
-#export ISOLINUX_DEFAULT=installgui
-
-# If set, limits the number of binary CDs to produce.
-export MAXCDS=1
-
-# If set, overrides the boot picture used.
-#export SPLASHPNG="$BASEDIR/../splash-skolelinux.png"
-
-# If set, overrides the logo used by g-i
-#export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-jessie.png"
-
-# 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"
-
-# Use the NOSOURCE variable to skip building the source CDs
-#export NOSOURCE=0
-export SOURCEONLY="yes"
-
-# Skip mirror check to speed up builds.
-SKIPMIRRORCHECK="yes"
-
-# Set to 1 to save space by omitting the installation manual.
-# If so the README will link to the manual on the web site.
-export OMIT_MANUAL=1
-
-# 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
-
-# Set this to override the defaul location
-#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
-
-#Specify suite here
-export SUITE="jessie-source-dvd"
-# List of languages for which language tasks from tasksel should be ;done
-# included. See tasks/README.tasksel for further info.
-export TASK_LANGLIST=tasksel_d-i.languages
-
-# 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

Copied: trunk/src/build/CD-administrator/CONF-jessie-source-usbstick.sh (from rev 84032, trunk/src/build/CD-administrator/CONF-jessie-source-dvd.sh)
===================================================================
--- trunk/src/build/CD-administrator/CONF-jessie-source-usbstick.sh	                        (rev 0)
+++ trunk/src/build/CD-administrator/CONF-jessie-source-usbstick.sh	2014-10-20 12:28:49 UTC (rev 84034)
@@ -0,0 +1,398 @@
+#
+# 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 SECURED           || true
+unset SECURITY          || 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 NORECOMMENDS      || true
+unset NOSUGGESTS        || true
+unset DOJIGDO           || true
+unset JIGDOCMD          || true
+unset JIGDOTEMPLATEURL  || true
+unset JIGDOFALLBACKURLS || true
+unset JIGDOINCLUDEURLS  || true
+unset JIGDOSCRIPT       || 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 SPLASHPNG         || true
+unset OMIT_RELEASE_NOTES || true
+unset SUITE || true
+unset SOURCEONLY || true
+unset LOGOPNG		|| true
+unset MAX_PKG_SIZE       || true
+
+# The debian-cd dir
+# Where I am (hoping I'm in the debian-cd dir)
+export BASEDIR=`pwd`
+
+# Set where to find the mirrors and where to store the temp files
+export TOPDIR=/skolelinux/administrator
+
+# Building this cd set ...
+export CODENAME=jessie
+
+# Using these local packages
+export LOCALCODE=jessie
+
+# By default use Debian installer packages from $CODENAME
+if [ ! "$DI_CODENAME" ]
+then
+  export DI_CODENAME=$CODENAME
+fi
+
+# If set, controls where the d-i components are downloaded from.
+# This may be an url, or "default", which will make it use the default url
+# for the daily d-i builds. If not set, uses the official d-i images from
+# the Debian mirror.
+#export DI_WWW_HOME=default
+
+# Version number, "2.2 r0", "2.2 r1" etc.
+export DEBVERSION="8.0+edu0~a0"
+
+# 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_DPKG_CPU 2>/dev/null || true`
+#        if [ -z "$CPU" ]; then
+#                CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+#        fi
+#        KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_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
+
+ARCHES="source"
+export ARCHES
+
+# 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
+#	      takes a lot of extra room to create the sandbox for the ISO
+#	      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=$TOPDIR/debmirror/debian/debian
+
+# 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=$TOPDIR/debmirror/builder_temp_dir/jessie-source-usbstick
+
+# Path where the images will be written
+export OUT=$TDIR/CD/jessie-source-usbstick
+
+# Where we keep the temporary apt stuff.
+# This cannot reside on an NFS mount.
+export APTTMP=$TDIR/apt
+
+# 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
+
+# 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
+
+# If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with 
+# local packages that you want to put on the CD set then
+# uncomment the following line 
+#export LOCAL=1
+
+# 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
+# use local-mirror mirror for local
+#export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/local-mirror
+# use morror-link for local-test
+#export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/mirror-link
+
+# 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
+
+# Where to find the security patches.  This directory should be the
+# top directory of a security.debian.org mirror.
+export SECURITY="$TOPDIR"/debmirror/debian/debian-security
+
+# Sparc only : bootdir (location of cd.b and second.b)
+# export BOOTDIR=/boot
+
+# Symlink farmers should uncomment this line :
+# export SYMLINK=1
+
+# Use this to force copying the files instead of symlinking or hardlinking
+# them. This is useful if your destination directories are on a different
+# partition than your source files.
+export COPYLINK=0
+
+# Options
+# export MKISOFS=/usr/bin/mkisofs
+# export MKISOFS_OPTS="-r"		#For normal users
+# export MKISOFS_OPTS="-r -F ."	#For symlink farmers
+
+# ISOLinux support for multiboot on CD1 for i386
+export ISOLINUX=0
+
+# 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=2000000000 # 1.86 GiB
+
+# 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 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
+# CUSTOM:            up to you - specify a size to go with it (in 2K blocks)
+#export DISKTYPE=CD
+#export DISKTYPE=DVD
+export DISKTYPE=CUSTOM
+export CUSTOMSIZE=7864320 # 15 GiB
+
+# We don't want certain packages to take up space on CD1...
+#export EXCLUDE="$BASEDIR"/tasks/exclude-sarge
+#export EXCLUDE="$BASEDIR"/tasks/exclude-etch
+# ...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
+
+# Set this if the recommended packages should be skipped when adding 
+# 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 and SHA1 sums for generated images
+export IMAGESUMS=1
+
+# 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 by piping mkisofs directly into jigdo-file,
+#     no temporary iso image is created (saves lots of disk space).
+#     NOTE: The no-temp-iso will not work for (at least) alpha and powerpc
+#     since they need the actual .iso to make it bootable. For these archs,
+#     the temp-iso will be generated, but deleted again immediately after the
+#     jigdo stuff is made; needs temporary space as big as the biggest image.
+#export DOJIGDO=2
+#
+# jigdo-file command & options
+# Note: building the cache takes hours, so keep it around for the next run
+#export JIGDOCMD="/usr/local/bin/jigdo-file --cache=$HOME/jigdo-cache.db"
+#
+# 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
+# correct. If it is non-empty, it needs a trailing slash. "%ARCH%"
+# will be substituted by the current architecture.
+#export JIGDOTEMPLATEURL=""
+#
+# Name of a directory on disc to create data for a fallback server in. 
+# Should later be made available by you at the URL given in
+# JIGDOFALLBACKURLS. In the directory, two subdirs named "Debian" and
+# "Non-US" will be created, and filled with hard links to the actual
+# files in your FTP archive. Because of the hard links, the dir must
+# be on the same partition as the FTP archive! If unset, no fallback
+# data is created, which may cause problems - see README.
+#export JIGDOFALLBACKPATH="$(OUT)/snapshot/"
+#
+# 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/"
+#
+# 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"
+#
+# $JIGDOTEMPLATEURL and $JIGDOINCLUDEURLS are passed to
+# "tools/jigdo_header", which is used by default to generate the
+# [Image] and [Servers] sections of the .jigdo file. You can provide
+# your own script if you need the .jigdo file to contain different
+# data.
+#export JIGDOSCRIPT="myscript"
+
+# Set to 1 to generate MD5 and SHA1 sums for generated images
+#export IMAGESUMS=1
+
+# 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/"
+
+# 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.
+# Lines starting with '#' are comments.  The package order is
+# important, as the packages will be installed in the given order.
+#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/udeb_include
+#export UDEB_INCLUDE="$BASEDIR"/data/$CODENAME/${ARCHES}_udeb_include
+
+# File with list of packages to exclude as above.
+#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/udeb_exclude
+#export UDEB_EXCLUDE="$BASEDIR"/data/$CODENAME/exclude-udebs-$ARCHES
+
+# File with list of packages to include when running debootstrap from
+# the first stage installer (currently only supported in
+# debian-installer). One package per line.  Lines starting with '#'
+# are comments.  The package order is important, as the packages will
+# be installed in the given order.
+#export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include
+
+# 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).
+# INSTALLER_CD=0: nothing special (default)
+# 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
+
+export TASK=Debian-edu-netinst
+
+# Parameters to pass to kernel when the CD boots. Not currently supported
+# for all architectures.
+#export KERNEL_PARAMS="quiet"
+
+# Enable graphical installer
+#export ISOLINUX_DEFAULT=installgui
+
+# If set, limits the number of binary CDs to produce.
+export MAXCDS=1
+
+# If set, overrides the boot picture used.
+#export SPLASHPNG="$BASEDIR/../splash-skolelinux.png"
+
+# If set, overrides the logo used by g-i
+#export LOGOPNG="$BASEDIR/../debian-edu-installer-logo-jessie.png"
+
+# 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"
+
+# Use the NOSOURCE variable to skip building the source CDs
+#export NOSOURCE=0
+export SOURCEONLY="yes"
+
+# Skip mirror check to speed up builds.
+SKIPMIRRORCHECK="yes"
+
+# Set to 1 to save space by omitting the installation manual.
+# If so the README will link to the manual on the web site.
+export OMIT_MANUAL=1
+
+# 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
+
+# Set this to override the defaul location
+#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"
+
+#Specify suite here
+export SUITE="jessie-source-usbstick"
+# List of languages for which language tasks from tasksel should be ;done
+# included. See tasks/README.tasksel for further info.
+export TASK_LANGLIST=tasksel_d-i.languages
+
+# 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

Modified: trunk/src/build/CD-administrator/Makefile
===================================================================
--- trunk/src/build/CD-administrator/Makefile	2014-10-20 12:23:12 UTC (rev 84033)
+++ trunk/src/build/CD-administrator/Makefile	2014-10-20 12:28:49 UTC (rev 84034)
@@ -11,7 +11,7 @@
 	edu-testing-nolocal-netinst \
 	jessie-amd64-i386-netinst \
 	jessie-usbstick \
-	jessie-source-dvd
+	jessie-source-usbstick \
 	wheezy-test-amd64-i386-netinst \
 	wheezy-test-usbstick \
 	wheezy-amd64-i386-netinst \




More information about the debian-edu-commits mailing list