summaryrefslogtreecommitdiff
path: root/meta-google/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-google/conf')
-rw-r--r--meta-google/conf/distro/gbmc.conf15
-rw-r--r--meta-google/conf/layer.conf2
2 files changed, 12 insertions, 5 deletions
diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf
index 0aca6318c..bbba7efed 100644
--- a/meta-google/conf/distro/gbmc.conf
+++ b/meta-google/conf/distro/gbmc.conf
@@ -7,14 +7,21 @@ DISTRO_NAME = "gBMC (OpenBMC + Google customizations)"
DISTRO_VERSION = "gbmc-release-${GBMC_VERSION}"
DISTROOVERRIDES .= ":gbmc"
-DISTRO_FEATURES_remove = "ldap"
-DISTRO_FEATURES_remove = "slp"
+# Possible values: "dev", "prod"
+GBMC_CONFIG ?= "dev"
+OVERRIDES .= ":${GBMC_CONFIG}:"
+
+DISTRO_FEATURES:remove = "ldap"
+DISTRO_FEATURES:remove = "slp"
# Required to get entity-manager to build with FruDevice service
-DISTRO_FEATURES_append = " ipmi-fru"
+DISTRO_FEATURES:append = " ipmi-fru"
+
+# Disable u-boot shell for prod builds
+DISTRO_FEATURES:append:prod = " disable-u-boot-shell"
WATCHDOG_PKG ?= "watchdog"
-SANITY_TESTED_DISTROS_append = " Debian-rodete \n debian-rodete \n "
+SANITY_TESTED_DISTROS:append = " Debian-rodete \n debian-rodete \n "
PREFERRED_PROVIDER_virtual/bmc-update ?= "inplace-gbmc-update"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index ed605d1e6..47379e427 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,4 +14,4 @@ BBFILES_DYNAMIC += " \
BBFILE_COLLECTIONS += "google-layer"
BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_google-layer = "hardknott honister"