From 74238bffbde967b83a6c9db762caf8a18430dcd2 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 29 Dec 2017 18:17:05 +0100 Subject: 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 --- armband-fuel-config.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'armband-fuel-config.mk') 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. -- cgit 1.2.3-korg