From: Alexandru Avadanii Date: Mon, 13 Jun 2016 16:29:45 +0000 (+0200) Subject: Makefile: git submodules should track remotes. X-Git-Tag: colorado.1.rc1~405^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F75%2F15475%2F1;hp=6e550c6218dec06ea801951dd2bd51b04362e18d;p=armband.git Makefile: git submodules should track remotes. Instead of binding git submodules to a specific commit, track their remote origins at `make submodules-init`. This introduces the risk of upstream changes breaking our patches more frequently (used to be whenever we bumped submodules by hand), and requiring rebasing, but that already happens for Fuel@OPNFV. This represents a major improvement in tracking upstream and moving away from forking, at the expense of more frequent rebasing, until we upstream or move to post-installation step all our patches. For example, since we rebased our modules 1-2 weeks ago, quite a few patches landed upstream (e.g. [1]) that we missed in our builds. [1] https://bugs.launchpad.net/fuel/+bug/1587773 Change-Id: I2d9e0877513558c86f68875f03976002f757e5ee Signed-off-by: Alexandru Avadanii --- diff --git a/Makefile b/Makefile index b3b6525d..1772637e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: build submodules-init: @git submodule -q init @git submodule -q sync - @git submodule update + @git submodule update --remote # Cleans any changes made to submodules submodules-clean: