summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-11-16 16:19:36 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-11-16 15:34:14 +0000
commit4723a68345dc5f685dd54dda7fe2659dd794f9a5 (patch)
tree5405963d59dc1748d7000a7a39f11aca3dd40c08
parent936ea53dc31f6c59207b02ce018666f458d91858 (diff)
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>
-rw-r--r--patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch3
1 files changed, 2 insertions, 1 deletions
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 7faaeb49..35129e01 100644
--- 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";