path: root/Makefile
diff options
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-29 18:17:05 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-29 19:26:34 +0000
commit74238bffbde967b83a6c9db762caf8a18430dcd2 (patch)
tree0cc240960c732cc0c0f30fc74c9fe94b19462786 /Makefile
parentcf261dd7536c1b8b52ac585503b7f8348d56df90 (diff)
Makefile: Add `make upgrade` target
1. Fix missing default `make` target for `all` 2. `make submodules-clean` should checkout git submodule commit On patch apply, we tag the starting commit, so we can later export as patches all commits between that reference and another tag, applied simmetrically at the end of the patch apply process. Previously, `submodules-clean` checked out that starting tag. Change that behavior to use the commit ID referenced by parent git repo (armband) submodule, so when armband git submodules are updated (e.g. sometimes `make upgrade` might include such changes), the new reference will be picked up automatically. 3. Add `make upgrade` for fetching latest changes on current branch Change-Id: I03dc3953e91acfbe6ccb5e3bb2ccee7d28a0f7d5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'Makefile')
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 68a85bb..bd1ef6d 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,14 @@ export REVSTATE
include armband-fuel-config.mk
-all: release
+all: upgrade
+# Ignore release tag and upgrade Armband to latest change on <branch>/HEAD
+.PHONY: upgrade
+ @git fetch origin ${A_BRANCH}:${A_BRANCH}
+ @git checkout ${A_BRANCH}
+ @$(MAKE) -e submodules-clean patches-import
# Fetch & update git submodules, checkout remote HEAD
.PHONY: submodules-init
@@ -46,7 +53,7 @@ submodules-init: .submodules-init
# Clean any changes made to submodules, checkout Armband root commit
.PHONY: submodules-clean
-submodules-clean: .submodules-init
@git submodule -q foreach ' \
git am -q --abort 2>/dev/null; \
git checkout -q -f ${A_OPNFV_TAG}-root 2>/dev/null; \
@@ -54,7 +61,8 @@ submodules-clean: .submodules-init
git tag | grep ${A_OPNFV_TAG} | xargs git tag -d > /dev/null 2>&1; \
git reset -q --hard HEAD; \
git clean -xdff'
- @rm -f .submodules-patched
+ @rm -f .submodules-*
+ @$(MAKE) -e submodules-init
# Generate patches from submodules
.PHONY: patches-export