Allow multi-arch builds using D-I images from official mirrors or local D-I images

This is made possible by allowing to include a "%ARCH%" placeholder in the
environment variables DI_WWW_HOME and DI_DIR which is expanded to the correct
value at runtime.

Supported for Etch and later.

debian/changelog

@@ -116,6 +116,8 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   * Add alsa-base and alsa-utils to forcd1 for Lenny as they are no longer
     key packages in the desktop task, but we do want them on the first CD.
   * Drop support for building Sarge CDs.
+  * Allow multi-arch builds using D-I images from official mirrors or local
+    D-I images.
 
  -- Frans Pop <fjp@debian.org>  Tue, 14 Oct 2008 10:01:20 +0200
 

tools/boot/etch/common.sh

@@ -1,8 +1,12 @@
-
 # This file provides some common code that is intented to be called
 # by the various boot-<arch> scripts.
 
 
+# Expand %ARCH% variable in envvars for location of D-I images
+DI_WWW_HOME="$(echo "$DI_WWW_HOME" | sed -e 's|%ARCH%|$ARCH|g')"
+DI_DIR="$(echo "$DI_DIR" | sed -e 's|%ARCH%|$ARCH|g')"
+
+
 # install_languages decompacts the language packs, you should give the path
 # to the CD temporary tree.
 # This function should be called for all bootable images.

tools/boot/lenny/common.sh

@@ -1,8 +1,12 @@
-
 # This file provides some common code that is intented to be called
 # by the various boot-<arch> scripts.
 
 
+# Expand %ARCH% variable in envvars for location of D-I images
+DI_WWW_HOME="$(echo "$DI_WWW_HOME" | sed -e 's|%ARCH%|$ARCH|g')"
+DI_DIR="$(echo "$DI_DIR" | sed -e 's|%ARCH%|$ARCH|g')"
+
+
 # install_languages decompacts the language packs, you should give the path
 # to the CD temporary tree.
 # This function should be called for all bootable images.