From 376c76d05862ed38edeb217cd9480807571491a7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 28 Aug 2016 00:43:03 +0200 Subject: [PATCH] submodule: Kill fuel-astute Signed-off-by: Alexandru Avadanii --- .gitmodules | 4 ---- Makefile | 1 - patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 5 +---- upstream/fuel-astute | 1 - 4 files changed, 1 insertion(+), 10 deletions(-) delete mode 160000 upstream/fuel-astute diff --git a/.gitmodules b/.gitmodules index 1fffefb1..85b4d3f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,7 +34,3 @@ 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 diff --git a/Makefile b/Makefile index d5444cdb..f458f0d1 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,6 @@ patches-export: submodules-init patches-import: submodules-init @cd ${FUEL_BASE} && git checkout -q master @cd ${SUBMOD_DIR}/fuel-agent && git checkout -q ${FUEL_AGENT_COMMIT} - @cd ${SUBMOD_DIR}/fuel-astute && git checkout -q ${ASTUTE_COMMIT} @cd ${SUBMOD_DIR}/fuel-library && git checkout -q ${FUELLIB_COMMIT} @cd ${SUBMOD_DIR}/fuel-mirror && git checkout -q ${FUEL_MIRROR_COMMIT} @cd ${SUBMOD_DIR}/fuel-nailgun-agent && \ diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index df1bd110..844bb3a4 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -51,7 +51,7 @@ new file mode 100644 index 0000000..1e772f0 --- /dev/null +++ b/build/armband.mk -@@ -0,0 +1,54 @@ +@@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2016 Enea AB and others. +# Alexandru.Avadanii@enea.com @@ -76,9 +76,6 @@ index 0000000..1e772f0 + export FPB_CHANGE := refs/changes/31/311031/2 + + # Armband git submodules for Fuel/OPNFV components -+ export ASTUTE_REPO := ${ARMBAND_BASE}/upstream/fuel-astute -+ export ASTUTE_COMMIT := HEAD -+ + export NAILGUN_REPO := ${ARMBAND_BASE}/upstream/fuel-web + export NAILGUN_COMMIT := HEAD + 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 -- 2.16.6