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 --- ...date-bootstrap-target-build-time-estimate.patch | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch (limited to 'patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch') diff --git a/patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch deleted file mode 100644 index d8a7588f..00000000 --- a/patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Alexandru Avadanii -Date: Mon, 9 May 2016 17:08:06 +0200 -Subject: [PATCH] UX: Update bootstrap/target build time estimate. - -While building for a different architecture (e.g. AArch64 on x86_64), -the bootstrap/target image build may take longer, due to latency -introduced by using qemu-user-static. - -Signed-off-by: Alexandru Avadanii ---- - .../fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py -index 6e60fb8..95bc08a 100644 ---- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py -+++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py -@@ -180,9 +180,12 @@ def make_bootstrap(data): - OSLO_CONF = cfg.CONF - OSLO_CONF(opts, project='fuel-agent') - mngr = manager.Manager(bootdata) -- LOG.info("Build process is in progress. Usually it takes 15-20 minutes." -- " It depends on your internet connection and hardware" -- " performance.") -+ LOG.info("Build process is in progress. Usually it takes 15-20 minutes for" -+ " a native build (x86_64) and/or 30-45 minutes for each" -+ " cross-build (e.g. AArch64)." -+ " It depends on your internet connection, hardware performance" -+ " and selected bootstrap architecture(s)." -+ " This ISO supports AArch64 only.") - mngr.do_mkbootstrap() - - return bootdata['bootstrap']['uuid'], bootdata['output'] -- cgit 1.2.3-korg