X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fconfig.mk;h=5448c5eb4ec6f6ad3e022c7321942c67a3aead21;hb=14669b1166d65270fbce9dabd957b643f74e7513;hp=ab30518b52ff8276bc9958e768753ba282d4bff0;hpb=3732d10a80446c1c079b9c30924a9fe2ca08d84c;p=fuel.git

diff --git a/build/config.mk b/build/config.mk
index ab30518b5..5448c5eb4 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -8,13 +8,19 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# fuel-main tag checked out from upstream `fuel-main` repo before patching it
-FUEL_MAIN_TAG = 9.0.1
-MOS_VERSION   = 9.0
-OPENSTACK_VERSION = mitaka-9.0
+# This tag is NOT checked out, it only serves a cosmetic purpose of hinting
+# what upstream Fuel components our submodules are bound to (while tracking
+# remotes, ALL submodules will point to remote branch HEAD).
+# NOTE: Pinning fuel-main or other submodules to a specific commit/tag is
+# done ONLY via git submodules.
+FUEL_MAIN_TAG = master
+MOS_VERSION   = 10.0
+OPENSTACK_VERSION = newton-10.0
 
-# FIXME(alav): Disable remote tracking for now, stick to submodule commits
-FUEL_TRACK_REMOTES =
+# List of space-separated Ubuntu architectures supported with current build
+# Format: same as `dpkg-architecture -qDEB_HOST_ARCH`
+# NOTE: Currently only amd64 is supported by Fuel@OPNFV. Armband adds arm64.
+export UBUNTU_ARCH ?= amd64
 
 ##############################################################################
 # Fuel components pinning / remote tracking; use submodules from f_repos
@@ -22,6 +28,7 @@ FUEL_TRACK_REMOTES =
 
 # git submodule & patch locations for Fuel components
 F_GIT_ROOT   := $(shell git rev-parse --show-toplevel)
+F_GIT_DIR    := $(shell git rev-parse --git-dir)
 F_SUBMOD_DIR := ${F_GIT_ROOT}/build/f_repos/sub
 F_PATCH_DIR  := ${F_GIT_ROOT}/build/f_repos/patch
 F_OPNFV_TAG  := ${FUEL_MAIN_TAG}-opnfv
@@ -29,6 +36,7 @@ F_OPNFV_TAG  := ${FUEL_MAIN_TAG}-opnfv
 # fuel-main repo location used by main Makefile ISO building, use submodule
 FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main
 
+
 export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library
 export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web
 export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient
@@ -36,11 +44,9 @@ export FUEL_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-agent
 export FUEL_NAILGUN_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-nailgun-agent
 export ASTUTE_REPO?=${F_SUBMOD_DIR}/fuel-astute
 export OSTF_REPO?=${F_SUBMOD_DIR}/fuel-ostf
-export FUEL_MIRROR_REPO?=${F_SUBMOD_DIR}/fuel-mirror
 export FUELMENU_REPO?=${F_SUBMOD_DIR}/fuel-menu
 export SHOTGUN_REPO?=${F_SUBMOD_DIR}/shotgun
 export NETWORKCHECKER_REPO?=${F_SUBMOD_DIR}/network-checker
-export FUELUPGRADE_REPO?=${F_SUBMOD_DIR}/fuel-upgrade
 export FUEL_UI_REPO?=${F_SUBMOD_DIR}/fuel-ui
 
 # OPNFV tags are automatically applied by `make -C f_repos patches-import`