From bc8ece0a7e1643310cc0dabe4bc303a6ed9b1802 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 6 Dec 2016 17:15:55 +0100 Subject: build: Disable git submodule remote tracking Instead of fetching remote branch head, stick to commits we bound to in Armband. This prevents further breakage when our submodules are updated upstream. Change-Id: I231aa4458bfea51608400d3a6c7d670f4413176d Signed-off-by: Alexandru Avadanii --- Makefile | 2 +- upstream/fuel-agent | 2 +- upstream/fuel-astute | 2 +- upstream/fuel-library | 2 +- upstream/fuel-mirror | 2 +- upstream/fuel-plugin-opendaylight | 2 +- upstream/fuel-web | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d3bc979a..11e815a3 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ submodules-init: @if [ ! -d ${FUEL_BASE}/build ]; then \ git submodule -q init; \ git submodule -q sync; \ - git submodule update --remote; \ + git submodule update; \ fi # Clean any changes made to submodules, checkout Armband root commit diff --git a/upstream/fuel-agent b/upstream/fuel-agent index 2cd6925c..7ffbf39c 160000 --- a/upstream/fuel-agent +++ b/upstream/fuel-agent @@ -1 +1 @@ -Subproject commit 2cd6925ce2986b58a3ff1dcade12f55a41bff71e +Subproject commit 7ffbf39caf5845bd82b8ce20a7766cf24aa803fb diff --git a/upstream/fuel-astute b/upstream/fuel-astute index 65309028..390b2572 160000 --- a/upstream/fuel-astute +++ b/upstream/fuel-astute @@ -1 +1 @@ -Subproject commit 65309028c2b65cee68bb865f3895ed185922f3b2 +Subproject commit 390b257240d49cc5e94ed5c4fcd940b5f2f6ec64 diff --git a/upstream/fuel-library b/upstream/fuel-library index 0744f4b3..e283b627 160000 --- a/upstream/fuel-library +++ b/upstream/fuel-library @@ -1 +1 @@ -Subproject commit 0744f4b3fb170d98c7ba70160cd9b91064865bd6 +Subproject commit e283b62750d9e26355981b3ad3be7c880944ae0f diff --git a/upstream/fuel-mirror b/upstream/fuel-mirror index 81246a7e..d1ef06b5 160000 --- a/upstream/fuel-mirror +++ b/upstream/fuel-mirror @@ -1 +1 @@ -Subproject commit 81246a7ecd95c27b388df8f8954e4fb81a3f06e4 +Subproject commit d1ef06b530ce2149230953bb3810a88ecaff870c diff --git a/upstream/fuel-plugin-opendaylight b/upstream/fuel-plugin-opendaylight index 8cc22c47..5d1885b2 160000 --- a/upstream/fuel-plugin-opendaylight +++ b/upstream/fuel-plugin-opendaylight @@ -1 +1 @@ -Subproject commit 8cc22c4717d2da338135d854e1d13aac3ef75314 +Subproject commit 5d1885b2583e65b4b123093c6cb113e9bb5d32eb diff --git a/upstream/fuel-web b/upstream/fuel-web index d3463ad9..e2b85baf 160000 --- a/upstream/fuel-web +++ b/upstream/fuel-web @@ -1 +1 @@ -Subproject commit d3463ad92df45541fc0107801aef71e73a194ec4 +Subproject commit e2b85bafb68c348f25cb7cceda81edc668ba2e64 -- cgit 1.2.3-korg