diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-12 21:32:05 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-12 21:50:43 +0200 |
| commit | e49d5070a5f17c2aa52167ce157b4e3d4d6674dd (patch) | |
| tree | a1a72153a1894ace0bd51606792e37ec1e8dcccb /patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | |
| parent | a1485af5146bf13456af0f995612d2a502cd7a39 (diff) | |
Upstream: Fuel@OPNFV: Fuel Master VM templates
While at it, also upstream:
"build: Use OPNFV_GIT_SHA for ISO preparer ID"
JIRA: ARMBAND-98
JIRA: ARMBAND-146
Conflicts:
patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch
patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
Change-Id: Ifcd7b3041d172aa492e26477c0872cd96efd90ba
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.patch | 4 |
1 files changed, 2 insertions, 2 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 9e089522..20642fc3 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -136,8 +136,8 @@ index daad663..e4874df 100755 -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \ -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \ -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \ -- -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH \ -+ -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE \ +- -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \ ++ -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA -e ARMBAND_BASE \ -u $USER_ID:$GROUP_ID -w $PWD \ -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT" |