aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-09-05 13:51:57 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-09-05 12:09:33 +0000
commit957a16139281785c2a6685428f7b037d6578f08d (patch)
tree61babc1151e3461ab1fb092c4702daa4d86af8a8 /patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
parent0ce564a34593b5c6ca80727c7fd32d6f62ad040e (diff)
Upstream: move patches to repo-patches dir
Upstream change: [1] Slight rebase of our patches is now needed. [1] https://gerrit.opnfv.org/gerrit/#/c/20043/ Change-Id: I955ae3c5c304d8c8da6e42680c81e9255487fb68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch')
-rw-r--r--patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
index df1bd110..fee234d7 100644
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
@@ -25,18 +25,16 @@ index 4454c35..377ecc6 100644
############################################################################
# BEGIN of variables to customize
#
-@@ -129,6 +132,9 @@ $(ISOCACHE):
- sudo docker info
- cd /tmp/fuel-main && make repos
- $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt
+@@ -129,5 +132,8 @@ $(ISOCACHE):
+ cd $(FUEL_MAIN_DIR) && make repos
+ $(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt
+ @if test -n $(ARMBAND_BASE); then \
+ $(REPOINFO) -r $(ARMBAND_BASE) >> gitinfo_fuel.txt; \
+ fi
# OPNFV patches at Fuel build time
# Need to be commited in order for them to be considered by the Fuel
# build system
-@@ -228,6 +234,10 @@ debug:
- sha1sum *.patch >> .cachedata
+@@ -228,5 +234,9 @@ debug:
sha1sum fuel_build_loop >> .cachedata
sha1sum config.mk >> .cachedata
+ @if test -n $(ARMBAND_BASE); then \