diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:01:54 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:48:48 +0300 |
| commit | 456380bb272d3a301c887eee513a3937cc1f48e1 (patch) | |
| tree | 124399167d539582befbe35ad28377eaea6cc8bc /meta-openbmc-mods/conf | |
| parent | 9722c6ee87766a45a337c094d1293de81cdcb106 (diff) | |
| download | openbmc-456380bb272d3a301c887eee513a3937cc1f48e1.tar.xz | |
Update to internal 10-22-19
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/conf')
| -rw-r--r-- | meta-openbmc-mods/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-openbmc-mods/conf/machine/include/intel.inc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-openbmc-mods/conf/layer.conf b/meta-openbmc-mods/conf/layer.conf index 35c801089..d87e98254 100644 --- a/meta-openbmc-mods/conf/layer.conf +++ b/meta-openbmc-mods/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel-openbmc" BBFILE_PATTERN_intel-openbmc = "^${LAYERDIR}/" BBFILE_PRIORITY_intel-openbmc = "5" -LAYERSERIES_COMPAT_intel-openbmc = "warrior" +LAYERSERIES_COMPAT_intel-openbmc = "warrior zeus" IMAGE_FEATURES[validitems] += "tools-sdk tools-debug" diff --git a/meta-openbmc-mods/conf/machine/include/intel.inc b/meta-openbmc-mods/conf/machine/include/intel.inc index 70297bab8..8b3b790e9 100644 --- a/meta-openbmc-mods/conf/machine/include/intel.inc +++ b/meta-openbmc-mods/conf/machine/include/intel.inc @@ -25,3 +25,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" PREFERRED_PROVIDER_virtual/obmc-inventory-data = "entity-manager" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native ?= "intel-led-manager-config-native" #PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor" + +# add all the upstream intel override fixes +OVERRIDES .= ":intel" |