include armband-fuel-config.mk
-all: release
+all: upgrade
+
+# Ignore release tag and upgrade Armband to latest change on <branch>/HEAD
+.PHONY: upgrade
+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
# Clean any changes made to submodules, checkout Armband root commit
.PHONY: submodules-clean
-submodules-clean: .submodules-init
+submodules-clean:
@git submodule -q foreach ' \
git am -q --abort 2>/dev/null; \
git checkout -q -f ${A_OPNFV_TAG}-root 2>/dev/null; \
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
A_PATCH_DIR := ${ARMBAND_BASE}/patches
A_OPNFV_TAG = armband-opnfv
A_PATCHES = $(shell find ${A_PATCH_DIR} -name '*.patch')
+A_BRANCH = $(shell sed -ne 's/defaultbranch=//p' ${ARMBAND_BASE}/.gitreview)
F_PATCH_DIR := ${A_FUEL_BASE}/mcp/patches
# To enable remote tracking, set the following var to any non-empty string.