commit ca3e1d9f86212282ca59f384055497eb0d156d49
author Thang Q. Nguyen <thang@os.amperecomputing.com> Thu Aug 12 10:21:36 2021 +0000
committer Thang Q. Nguyen <thang@os.amperecomputing.com> Fri Aug 13 08:00:42 2021 +0000
tree 83e2db0f50a87dfab90432a5c02e11d91ce2f6f3
parent 5037330368f3e01c45dc0e42b39246afa2c6c44a

meta-ampere: fix compilation error with latest Yocto

Make the following changes to fix compilation errors:
1. Add honister to LAYERSERIES_COMPAT
2. Increase CONF_VERSION to 2.
3. Fix mistake on previous change on Yocto syntax update.

Tested:
1. Compile OpenBMC for Mt.Jade without error.

Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I5ac3f568d776109955759fab78844b1d38a51af1

meta-ampere/meta-jade/conf/layer.conf

diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index e8abd69..7b5a07f 100644
--- a/meta-ampere/meta-jade/conf/layer.conf
+++ b/meta-ampere/meta-jade/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "jade-layer"
 BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jade-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_jade-layer = "gatesgarth hardknott honister"

meta-ampere/meta-jade/conf/local.conf.sample

diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/local.conf.sample
index 914da71..1d3c714 100644
--- a/meta-ampere/meta-jade/conf/local.conf.sample
+++ b/meta-ampere/meta-jade/conf/local.conf.sample
@@ -117,7 +117,7 @@
 # There are other application targets that can be used here too, see
 # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 
 #
 # Additional image features
@@ -169,7 +169,7 @@
 # files and damages the build in ways which may not be easily recoverable.
 # It's necessary to monitor /tmp, if there is no space left the build will fail
 # with very exotic errors.
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
@@ -212,4 +212,4 @@
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
-CONF_VERSION = "1"
+CONF_VERSION = "2"

meta-ampere/meta-jade/conf/machine/mtjade.conf

diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 67e852b..2c948df 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -19,6 +19,7 @@
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-flash-mgmt \
         obmc-chassis-state-mgmt \
+        obmc-host-state-mgmt \
         obmc-bmc-state-mgmt \
         "