build/install: Fix missing arch list from Release

During the previous attempt to fix the local mirror rebuild by
reworking `atp-ftparchive` configuration, we removed the arch
list from the main configuration, which led to the local Release
file missing "Architectures" entries.

This led to "/etc/fuel_openstack_arch" not being populated,
binfmt not starting on the first boot, and bootstrap build failing.

Bring back the "Architecture" config line to restore the old
behavior.

JIRA: ARMBAND-163

Change-Id: Ica64fcd60ed4e0185d2cab5457603b42d3d55af8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch
index 7faaeb4..35129e0 100644 (file)
--- a/patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch
@@ -73,11 +73,12 @@ diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftpar
 index e40ff68..ceaf71a 100644
 --- a/build/install/apt-ftparchive-release.conf
 +++ b/build/install/apt-ftparchive-release.conf
-@@ -13,6 +13,6 @@ APT::FTPArchive::Release::Label "mos9.0";
+@@ -13,6 +13,7 @@ APT::FTPArchive::Release::Label "mos9.0";
  APT::FTPArchive::Release::Suite "mos9.0";
  APT::FTPArchive::Release::Version "14.04";
  APT::FTPArchive::Release::Codename "mos9.0";
 -APT::FTPArchive::Release::Architectures "amd64";
++APT::FTPArchive::Release::Architectures "amd64 arm64";
  APT::FTPArchive::Release::Components "main";
  APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS";
 +APT::FTPArchive::Contents "no";