diff options
Diffstat (limited to 'meta-intel/conf')
| -rw-r--r-- | meta-intel/conf/layer.conf | 5 | ||||
| -rw-r--r-- | meta-intel/conf/machine/include/intel.inc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index 99a6df061..b43594da5 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -8,7 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "thud warrior" - -# Provide a variable that points the base of the intel layer. -INTELBASE = '${@os.path.normpath("${LAYERDIR}/")}' +LAYERSERIES_COMPAT_intel = "warrior zeus" diff --git a/meta-intel/conf/machine/include/intel.inc b/meta-intel/conf/machine/include/intel.inc index db6b0c10e..738d103e5 100644 --- a/meta-intel/conf/machine/include/intel.inc +++ b/meta-intel/conf/machine/include/intel.inc @@ -19,3 +19,5 @@ PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" #PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor" + +OVERRIDES .= ":intel" |