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 --- .gitmodules | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 1fffefb1..f37e0c96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,39 +2,19 @@ path = upstream/fuel url = https://gerrit.opnfv.org/gerrit/fuel branch = master -[submodule "fuel-library"] - path = upstream/fuel-library - url = https://github.com/openstack/fuel-library.git - branch = stable/mitaka -[submodule "fuel-web"] - path = upstream/fuel-web - url = https://github.com/openstack/fuel-web.git - branch = stable/mitaka -[submodule "fuel-agent"] - path = upstream/fuel-agent - url = https://github.com/openstack/fuel-agent.git - branch = stable/mitaka -[submodule "fuel-mirror"] - path = upstream/fuel-mirror - url = https://github.com/openstack/fuel-mirror.git - branch = stable/mitaka + ignore = all [submodule "fuel-plugin-opendaylight"] path = upstream/fuel-plugin-opendaylight url = https://github.com/openstack/fuel-plugin-opendaylight.git branch = master -[submodule "fuel-nailgun-agent"] - path = upstream/fuel-nailgun-agent - url = https://github.com/openstack/fuel-nailgun-agent - branch = stable/mitaka + ignore = all [submodule "fuel-plugin-ovs"] path = upstream/fuel-plugin-ovs url = https://github.com/openstack/fuel-plugin-ovs branch = master + ignore = all [submodule "vswitchperf"] path = upstream/vswitchperf url = https://gerrit.opnfv.org/gerrit/vswitchperf.git branch = master -[submodule "fuel-astute"] - path = upstream/fuel-astute - url = https://github.com/openstack/fuel-astute.git - branch = stable/mitaka + ignore = all -- cgit 1.2.3-korg