diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-19 15:48:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-19 15:48:03 +0000 |
| commit | 56b0a136525f957644e09f10d1f8c30fb3b54104 (patch) | |
| tree | 6908061f612b47ee2e2e96a68103db85deeeabfa /patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch | |
| parent | 25bf48ee9230653723f0c7982de5365a3b633ed1 (diff) | |
| parent | ec307077e542fd290701a871fedc7f58db37712c (diff) | |
Merge "build: ISO refactor, use docker, enable cache"
Diffstat (limited to 'patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch')
| -rw-r--r-- | patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch b/patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch new file mode 100644 index 00000000..37e4d078 --- /dev/null +++ b/patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch @@ -0,0 +1,22 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 16 Aug 2016 18:45:10 +0200 +Subject: [PATCH] build: Allow MIRROR_MOS_UBUNTU override + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/Makefile b/build/Makefile +index 4a4bb2e..6e18ddd 100644 +--- a/build/Makefile ++++ b/build/Makefile +@@ -60,7 +60,7 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | + + export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py) + +-export MIRROR_MOS_UBUNTU := $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3) ++export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3) + export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1) + export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU) + |