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 --- upstream/fuel-agent | 1 - upstream/fuel-astute | 1 - upstream/fuel-library | 1 - upstream/fuel-mirror | 1 - upstream/fuel-nailgun-agent | 1 - upstream/fuel-web | 1 - 6 files changed, 6 deletions(-) delete mode 160000 upstream/fuel-agent delete mode 160000 upstream/fuel-astute delete mode 160000 upstream/fuel-library delete mode 160000 upstream/fuel-mirror delete mode 160000 upstream/fuel-nailgun-agent delete mode 160000 upstream/fuel-web (limited to 'upstream') diff --git a/upstream/fuel-agent b/upstream/fuel-agent deleted file mode 160000 index 2cd6925c..00000000 --- a/upstream/fuel-agent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2cd6925ce2986b58a3ff1dcade12f55a41bff71e diff --git a/upstream/fuel-astute b/upstream/fuel-astute deleted file mode 160000 index 65309028..00000000 --- a/upstream/fuel-astute +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65309028c2b65cee68bb865f3895ed185922f3b2 diff --git a/upstream/fuel-library b/upstream/fuel-library deleted file mode 160000 index 0744f4b3..00000000 --- a/upstream/fuel-library +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0744f4b3fb170d98c7ba70160cd9b91064865bd6 diff --git a/upstream/fuel-mirror b/upstream/fuel-mirror deleted file mode 160000 index 81246a7e..00000000 --- a/upstream/fuel-mirror +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 81246a7ecd95c27b388df8f8954e4fb81a3f06e4 diff --git a/upstream/fuel-nailgun-agent b/upstream/fuel-nailgun-agent deleted file mode 160000 index 46fa0db0..00000000 --- a/upstream/fuel-nailgun-agent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46fa0db0f8944f9e67699d281d462678aaf4db26 diff --git a/upstream/fuel-web b/upstream/fuel-web deleted file mode 160000 index d3463ad9..00000000 --- a/upstream/fuel-web +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d3463ad92df45541fc0107801aef71e73a194ec4 -- cgit 1.2.3-korg