diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:42:44 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-04-17 19:13:25 +0300 |
| commit | 816d793003e93c1e5eec0a2e90fbd8b9dde9f7a5 (patch) | |
| tree | 341534fed9a2de460ded7f8231ca1cbb178bb2ca /meta-openbmc-mods/conf | |
| parent | a75bff085ba9443315222231c42692745e5781e9 (diff) | |
| download | openbmc-816d793003e93c1e5eec0a2e90fbd8b9dde9f7a5.tar.xz | |
Update 4-15-19
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/conf')
| -rw-r--r-- | meta-openbmc-mods/conf/layer.conf | 10 | ||||
| -rw-r--r-- | meta-openbmc-mods/conf/machine/include/intel.inc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-openbmc-mods/conf/layer.conf b/meta-openbmc-mods/conf/layer.conf index 9cc62fc6a..35c801089 100644 --- a/meta-openbmc-mods/conf/layer.conf +++ b/meta-openbmc-mods/conf/layer.conf @@ -3,12 +3,12 @@ BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" + ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "intel" -BBFILE_PATTERN_intel = "^${LAYERDIR}/" -BBFILE_PRIORITY_intel = "5" -LAYERSERIES_COMPAT_intel = "thud" +BBFILE_COLLECTIONS += "intel-openbmc" +BBFILE_PATTERN_intel-openbmc = "^${LAYERDIR}/" +BBFILE_PRIORITY_intel-openbmc = "5" +LAYERSERIES_COMPAT_intel-openbmc = "warrior" 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 20ca34a66..9fedc33e7 100644 --- a/meta-openbmc-mods/conf/machine/include/intel.inc +++ b/meta-openbmc-mods/conf/machine/include/intel.inc @@ -9,7 +9,7 @@ OBMC_MACHINE_FEATURES += "\ " VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" - +VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager" VIRTUAL-RUNTIME_obmc-led-monitor = "" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" @@ -18,6 +18,6 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +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" |