diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | armband-fuel-config.mk | 1 |
2 files changed, 12 insertions, 3 deletions
@@ -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 +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 +submodules-clean: @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 diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk index 3b2bd7b8..a4a0ad5e 100644 --- a/armband-fuel-config.mk +++ b/armband-fuel-config.mk @@ -12,6 +12,7 @@ A_FUEL_BASE := ${ARMBAND_BASE}/upstream/fuel 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. |