commit 826a1f731b1f4c1cd62f892515bfead9d4c5ecbf
author Ryan Sie <ryans@supermicro.com.tw> Thu Oct 14 09:49:20 2021 +0800
committer Patrick Williams <patrick@stwcx.xyz> Fri Oct 15 01:32:08 2021 +0000
tree 7d7537f1d098bfc469cf4be95c77a208111d8b9f
parent faf59e054914202c4d2ee3ae7201616fedbaefe6

update meta-supermicro layer for new bitbake

Signed-off-by: Ryan Sie <ryans@supermicro.com.tw>
Change-Id: I05c85576fad2dae9f9a3e90afdac7565d9cefcf4

meta-supermicro/conf/layer.conf

diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index d3943d3..a5142e2 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -5,7 +5,9 @@
 BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
             ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "supermicro-layer"
-BBFILE_PATTERN_supermicro-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_supermicro-layer := "hardknott"
+BBFILE_COLLECTIONS += "supermicro"
+BBFILE_PATTERN_supermicro = "^${LAYERDIR}/"
+LAYERVERSION_supermicro = "1"
+LAYERSERIES_COMPAT_supermicro = "hardknott honister"
+LAYERDEPENDS_supermicro = "phosphor-layer"
 

meta-supermicro/conf/machine/include/supermicro.inc

diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc
index f7f37be..bb26af8 100644
--- a/meta-supermicro/conf/machine/include/supermicro.inc
+++ b/meta-supermicro/conf/machine/include/supermicro.inc
@@ -1,22 +1,22 @@
 OBMC_MACHINE_FEATURES += "\
         obmc-bmc-state-mgmt \
         obmc-chassis-state-mgmt \
-        obmc-host-ipmi \
         obmc-host-state-mgmt \
+        obmc-host-ipmi \
+        obmc-host-ctl \
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-flash-mgmt \
         "
 
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control"
 
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-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-host-ipmi-hw ?= "phosphor-ipmi-kcs"
 
 OVERRIDES .= ":supermicro"