summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorStefan Berg <stefan.k.berg@ericsson.com>2016-11-16 08:40:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-16 08:40:40 +0000
commitda5ed062277da74d394202a97ffa9344fe88ea2a (patch)
treee71e707c1584e94f74925400dd59fcc87b5428ee /build/Makefile
parentd4b0f79649da3ad7a3f3f59d3b92ea230f5b1826 (diff)
parent9f8aff6636e0d86834178b461802f3e7cb95189d (diff)
Merge "Uplift to Fuel 10.0/Newton"
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/build/Makefile b/build/Makefile
index fadb8a8ba..e836de117 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -18,7 +18,7 @@ SHELL = /bin/bash
# BEGIN of variables to customize
#
#Input args
-export MOSVERSION = 9.0
+export MOSVERSION = 10.0
export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
export PRODNO ?= "OPNFV_FUEL"
@@ -57,14 +57,14 @@ 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 LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
-# Fuel 9.0
-export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
-export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
-
-export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
-export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
+# Short circuiting normal package selection as this seems currently broken, see
+# hard coding in config.mk
+# 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 LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
+# export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
+# export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
+# export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
# uncomment and use: make print-VARIABLE
#print-% : ; @echo $* = $($*)