diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-08-29 12:46:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-29 12:46:06 +0000 |
| commit | d4f2f2a03cc7c6e0b9af49d18cc9c08c68306ca5 (patch) | |
| tree | 1f84a51dcaeba2d1b0c443c9cb217a5dbcfde1e8 | |
| parent | ad0dd57dc045b58c46e53f281ab57e70d00947d7 (diff) | |
| parent | dc647f941fc3923f5ed1f2888318b218c23f4362 (diff) | |
Merge changes from topic 'var-overrides'
* changes:
build: Allow MIRROR_MOS_UBUNTU override
build: Allow PLUGINS override
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index c4775a3da..b3905e364 100644 --- a/build/Makefile +++ b/build/Makefile @@ -57,7 +57,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) diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 4df7bcb0c..448f4158c 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have # verified it! -PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild +PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild export PLUGINS #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild |