From 42f8585ebb8fffad19a89314659ab9129176c3e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Oct 2016 13:18:11 +0200 Subject: build: Rework patch mechanism for Fuel submodules While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii --- .../0001-Add-arm64-for-auxiliary-repos.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 patches/fuel-library/multiarch-mirrors/0001-Add-arm64-for-auxiliary-repos.patch (limited to 'patches/fuel-library/multiarch-mirrors/0001-Add-arm64-for-auxiliary-repos.patch') diff --git a/patches/fuel-library/multiarch-mirrors/0001-Add-arm64-for-auxiliary-repos.patch b/patches/fuel-library/multiarch-mirrors/0001-Add-arm64-for-auxiliary-repos.patch new file mode 100644 index 00000000..6d8b0248 --- /dev/null +++ b/patches/fuel-library/multiarch-mirrors/0001-Add-arm64-for-auxiliary-repos.patch @@ -0,0 +1,36 @@ +From: Stanislaw Kardach +Date: Wed, 24 Feb 2016 20:05:25 +0100 +Subject: [PATCH] Add arm64 for auxiliary repos + +--- + deployment/puppet/fuel/files/Release-auxiliary | 2 +- + deployment/puppet/fuel/manifests/auxiliaryrepos.pp | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/deployment/puppet/fuel/files/Release-auxiliary b/deployment/puppet/fuel/files/Release-auxiliary +index 2d5ce58..03f84b8 100644 +--- a/deployment/puppet/fuel/files/Release-auxiliary ++++ b/deployment/puppet/fuel/files/Release-auxiliary +@@ -3,6 +3,6 @@ Label: auxiliary + Suite: auxiliary + Codename: auxiliary + Date: Mon, 15 Apr 2015 00:00:01 UTC +-Architectures: amd64 ++Architectures: amd64 arm64 + Components: main restricted + Description: Auxiliary +diff --git a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp +index 909fc92..4ec5d05 100644 +--- a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp ++++ b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp +@@ -45,7 +45,9 @@ class fuel::auxiliaryrepos( + $release_files = [ + "${ubuntu_dir}/dists/auxiliary/Release", + "${ubuntu_dir}/dists/auxiliary/main/binary-amd64/Release", +- "${ubuntu_dir}/dists/auxiliary/restricted/binary-amd64/Release"] ++ "${ubuntu_dir}/dists/auxiliary/restricted/binary-amd64/Release", ++ "${ubuntu_dir}/dists/auxiliary/main/binary-arm64/Release", ++ "${ubuntu_dir}/dists/auxiliary/restricted/binary-arm64/Release"] + + Exec['create_ubuntu_repo_dirs'] -> + Exec['create_ubuntu_repo_Packages'] -> -- cgit 1.2.3-korg