Bugfix: work on multi-arch enabled build systems

This commit is contained in:
Steve McIntyre 2014-04-08 18:18:44 +01:00
parent 0cfa70e113
commit ec29afa4cf
2 changed files with 3 additions and 0 deletions

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ debian-cd (3.1.15) UNRELEASED; urgency=low
[ Steve McIntyre ] [ Steve McIntyre ]
* Add "UEFI" text to the UEFI installer menu title to make it easier for * Add "UEFI" text to the UEFI installer menu title to make it easier for
end users to distinguish between UEFI and BIOS boot. end users to distinguish between UEFI and BIOS boot.
* tools/apt-selection: pass APT::Architectures:: when calling apt;
otherwise if we're running on a multi-arch system apt will break
[ Samuel Thibault ] [ Samuel Thibault ]
* Make kfreebsd & hurd images usbkey-bootable. Closes: #739422 * Make kfreebsd & hurd images usbkey-bootable. Closes: #739422

View File

@ -34,6 +34,7 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
-o APT::Cache::AllVersions=0 \ -o APT::Cache::AllVersions=0 \
-o APT::Cache::ShowVersion=1 \ -o APT::Cache::ShowVersion=1 \
-o APT::Architecture=$ARCH \ -o APT::Architecture=$ARCH \
-o APT::Architectures::=$ARCH \
-o Acquire::Languages=none" -o Acquire::Languages=none"
sections=main sections=main