diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-13 18:29:45 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-13 18:38:48 +0200 |
| commit | 5923831d4c9edda72ce6c0c4778d11f37d6f60f6 (patch) | |
| tree | 8fae349e72454617a0c20b9ff26e9a764d413281 | |
| parent | 6e550c6218dec06ea801951dd2bd51b04362e18d (diff) | |
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 <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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: |