Introduce new environment variable NOSOURCE that allows to build CD images

using a local mirror that does not contain source files. This new variable
obsoletes setting IMAGETARGET, though that is still supported for backwards
compatibility.

CONF.sh

@@ -20,6 +20,7 @@ unset MKISOFS           || true
 unset MKISOFS_OPTS      || true
 unset ISOLINUX          || true
 unset EXCLUDE           || true
+unset NOSOURCE          || true
 unset SRCEXCLUDE        || true
 unset NORECOMMENDS      || true
 unset NOSUGGESTS        || true
@@ -187,6 +188,11 @@ export DEFSRCSIZE=635
 # We also exclude some source packages
 #export SRCEXCLUDE="$BASEDIR"/tasks/exclude-src-$CODENAME
 
+# Set this if building source packages CDs should be skipped.
+# You won't need source packages on your local mirror in that case.
+# (Setting IMAGETARGET is now deprecated, though still supported.)
+#export NOSOURCE=1
+
 # Set this if the recommended packages should be skipped when adding 
 # package on the CD.  The default is 'false'.
 export NORECOMMENDS=1
@@ -318,11 +324,6 @@ done
 # If set, overrides the boot picture used.
 #export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.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
-
 # 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

build.sh

@@ -56,8 +56,18 @@ for CD in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
 done
 
 FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
-make list $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+
+LISTTARGET="list"
+if [ -n "$NOSOURCE" ] ; then
+    LISTTARGET="bin-list"
+fi
+make $LISTTARGET $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
+
 echo " ... building the images"
+# Setting IMAGETARGET directly is deprecated; NOSOURCE is preferred
+if [ -n "$NOSOURCE" ] ; then
+    IMAGETARGET="bin-official_images"
+fi
 if [ -z "$IMAGETARGET" ] ; then
     IMAGETARGET="official_images"
 fi

debian/changelog

@@ -150,9 +150,15 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
     useful to others:
     - allow to use different name for final iso image;
     - allow to set the script to be used in debootstrap to check if all
-      base need package are present;
+      base need package are present.
 
- -- Otavio Salvador <otavio@debian.org>  Fri, 15 Sep 2006 14:56:28 -0300
+  [ Frans Pop ]
+  * Introduce new environment variable NOSOURCE that allows to build CD images
+    using a local mirror that does not contain source files. This new variable
+    obsoletes setting IMAGETARGET, though that is still supported for
+    backwards compatibility. Closes: #320205.
+
+ -- Frans Pop <fjp@debian.org>  Sun,  1 Oct 2006 21:34:38 +0200
 
 debian-cd (2.2.24) unstable; urgency=low