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 --- .../0004-Fuel-VM-for-the-Enea-Armband-lab.patch | 111 --------------------- 1 file changed, 111 deletions(-) delete mode 100644 patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch (limited to 'patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch') diff --git a/patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch b/patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch deleted file mode 100644 index aa97aa69..00000000 --- a/patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 800aae6db0d0d79d01cec4df85075026073063dd Mon Sep 17 00:00:00 2001 -From: Josep Puigdemont -Date: Wed, 4 May 2016 14:27:23 +0200 -Subject: [PATCH] Fuel VM for the Enea Armband lab - -This is the initial VM description fit for Enea's Armband lab. - -Change-Id: Ia89f9728fff0ab1c279f6200fd558d9643cf4ea5 -Signed-off-by: Josep Puigdemont ---- - .../hardware_environment/vms/enea_lab/fuel.xml | 88 ++++++++++++++++++++++ - 1 file changed, 88 insertions(+) - create mode 100644 deploy/templates/hardware_environment/vms/enea_lab/fuel.xml - -diff --git a/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml -new file mode 100644 -index 0000000..8773ed4 ---- /dev/null -+++ b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml -@@ -0,0 +1,88 @@ -+ -+ fuel -+ 8290304 -+ 8290304 -+ 8 -+ -+ /machine -+ -+ -+ hvm -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ destroy -+ restart -+ restart -+ -+ -+ -+ -+ -+ /usr/libexec/qemu-kvm -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.5.5 - -- cgit 1.2.3-korg