diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-21 12:48:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-21 12:48:39 +0000 |
| commit | f1cdd0c49d4495a59bd797ee7353cef816976d4a (patch) | |
| tree | 2ff8660c5192300995edab32dd41ca623d6d47d6 /build/f_isoroot/Makefile | |
| parent | 218381cdc6073510d7ee280c1a5f54e56b25b051 (diff) | |
| parent | 35697966da656585c43e2a2342a135ada65703cb (diff) | |
Merge "Turn on fuelmenu by default, turn off biosdevname"
Diffstat (limited to 'build/f_isoroot/Makefile')
| -rw-r--r-- | build/f_isoroot/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 0f7f14fa0..bae2fe74d 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -16,12 +16,12 @@ PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfw # 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 $(BUILD_FUEL_PLUGINS) +#SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS) +SUBDIRS = f_kscfg f_bootstrap f_isolinux $(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 $(PLUGINS) +#SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS) +SUBDIRS = f_kscfg f_bootstrap f_isolinux $(PLUGINS) endif SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) |