Code Review
/
armband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "u/fuel: Bump & rebase for state break & retry"
[armband.git]
/
armband-fuel-config.mk
diff --git
a/armband-fuel-config.mk
b/armband-fuel-config.mk
index
fa82903
..
3b2bd7b
100644
(file)
--- a/
armband-fuel-config.mk
+++ b/
armband-fuel-config.mk
@@
-12,11
+12,11
@@
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_PATCH_DIR := ${ARMBAND_BASE}/patches
A_OPNFV_TAG = armband-opnfv
A_PATCHES = $(shell find ${A_PATCH_DIR} -name '*.patch')
-F_
BUILD_DIR := ${A_FUEL_BASE}/build
+F_
PATCH_DIR := ${A_FUEL_BASE}/mcp/patches
# To enable remote tracking, set the following var to any non-empty string.
# Leaving this var empty will bind each git submodule to its saved commit.
# To enable remote tracking, set the following var to any non-empty string.
# Leaving this var empty will bind each git submodule to its saved commit.
-ARMBAND_TRACK_REMOTES ?=
yes
+ARMBAND_TRACK_REMOTES ?=
# for the patches applying purposes (empty git config in docker build container)
export GIT_COMMITTER_NAME?=OPNFV Armband
# for the patches applying purposes (empty git config in docker build container)
export GIT_COMMITTER_NAME?=OPNFV Armband