From 8e599759ede512a773eccef59eb2824940307564 Mon Sep 17 00:00:00 2001 From: "Stefan K. Berg" Date: Fri, 8 Jan 2016 13:26:00 +0100 Subject: Fuel 8 uplift Introducing Fuel 8 with associated changes: Improvements in usage of cgroups - they are now bind mounted from the host which solved a Docker-in-Docker problem. The cache tool (cache.mk) has a new argument "getbiweek" which is used by the top Makefile when building the Fuel ISO. This makes sure that there's a fresh build every second week even if the cache is not purged automatically based on its meta data. This is something we should add everywhere (in a separate change set). And obviously, Fuel is now building from stable/8.0 upstream. NOTE! f_repobuild has been disabled for now, it throws an error when run. Will be fixed separately. Change-Id: I7e2ee737fd3bedc75f58539fbc3c5fd1fa08cfa1 Signed-off-by: Stefan K. Berg --- build/f_isoroot/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'build/f_isoroot/Makefile') diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 63f894b22..d8ac3c9e3 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -13,11 +13,15 @@ PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfw # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. +# Temporarilu disabling f_repobuild that currently have some issues on +# Fuel 8. ifdef BUILD_FUEL_PLUGINS -SUBDIRS = f_kscfg f_bootstrap f_repobuild $(BUILD_FUEL_PLUGINS) +#SUBDIRS = f_kscfg f_bootstrap f_repobuild $(BUILD_FUEL_PLUGINS) +SUBDIRS = f_kscfg f_bootstrap $(BUILD_FUEL_PLUGINS) $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS)) else -SUBDIRS = f_kscfg f_bootstrap f_repobuild $(PLUGINS) +#SUBDIRS = f_kscfg f_bootstrap f_repobuild $(PLUGINS) +SUBDIRS = f_kscfg f_bootstrap $(PLUGINS) endif SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) -- cgit 1.2.3-korg