From bb9fad32165fed72bd22016d5631aaf3d90c60c7 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Tue, 14 Oct 2008 08:22:00 +0000 Subject: [PATCH] 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 | 2 ++ tools/boot/etch/common.sh | 6 +++++- tools/boot/lenny/common.sh | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d64de145..62996c96 100644 --- a/debian/changelog +++ b/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 Tue, 14 Oct 2008 10:01:20 +0200 diff --git a/tools/boot/etch/common.sh b/tools/boot/etch/common.sh index 915d5266..289d84c5 100644 --- a/tools/boot/etch/common.sh +++ b/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- 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. diff --git a/tools/boot/lenny/common.sh b/tools/boot/lenny/common.sh index 915d5266..289d84c5 100644 --- a/tools/boot/lenny/common.sh +++ b/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- 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.