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.
This commit is contained in:
Frans Pop 2008-10-14 08:22:00 +00:00
parent d48db452d6
commit bb9fad3216
3 changed files with 12 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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 * 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. key packages in the desktop task, but we do want them on the first CD.
* Drop support for building Sarge CDs. * 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 -- Frans Pop <fjp@debian.org> Tue, 14 Oct 2008 10:01:20 +0200

View File

@ -1,8 +1,12 @@
# This file provides some common code that is intented to be called # This file provides some common code that is intented to be called
# by the various boot-<arch> scripts. # 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 # install_languages decompacts the language packs, you should give the path
# to the CD temporary tree. # to the CD temporary tree.
# This function should be called for all bootable images. # This function should be called for all bootable images.

View File

@ -1,8 +1,12 @@
# This file provides some common code that is intented to be called # This file provides some common code that is intented to be called
# by the various boot-<arch> scripts. # 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 # install_languages decompacts the language packs, you should give the path
# to the CD temporary tree. # to the CD temporary tree.
# This function should be called for all bootable images. # This function should be called for all bootable images.