From c4204aefeaf0d781998e54ab83831fcde7527b89 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 10 Aug 2016 16:43:39 +0200 Subject: build: Allow PLUGINS override Instead of using BUILD_FUEL_PLUGINS, which was intended for manual overrides of the Fule@OPNFV plugin list, allow PLUGINS to be preset to a custom list, which we will provide via Armband Makefile spec. Signed-off-by: Alexandru Avadanii --- build/f_isoroot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') 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 -- cgit 1.2.3-korg From dc647f941fc3923f5ed1f2888318b218c23f4362 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 16 Aug 2016 18:45:10 +0200 Subject: build: Allow MIRROR_MOS_UBUNTU override Signed-off-by: Alexandru Avadanii --- build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') 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) -- cgit 1.2.3-korg