6 files changed, 8 insertions, 4 deletions
diff --git a/meta-lenovo/conf/layer.conf b/meta-lenovo/conf/layer.conf
index b18d1ea9b..180e9603e 100644
--- a/meta-lenovo/conf/layer.conf
+++ b/meta-lenovo/conf/layer.conf
@@ -12,7 +12,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "lenovo-layer"
 BBFILE_PATTERN_lenovo-layer = ""
 LAYERVERSION_lenovo-layer = "1"
-LAYERSERIES_COMPAT_lenovo-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_lenovo-layer = "gatesgarth hardknott"
 
 # Provide a variable that points the base of the lenovo layer.
 LENOVOBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-lenovo/meta-hr630/conf/bblayers.conf.sample b/meta-lenovo/meta-hr630/conf/bblayers.conf.sample
index 5ecfeada5..0443211c5 100644
--- a/meta-lenovo/meta-hr630/conf/bblayers.conf.sample
+++ b/meta-lenovo/meta-hr630/conf/bblayers.conf.sample
@@ -12,7 +12,9 @@ BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-x86 \
diff --git a/meta-lenovo/meta-hr630/conf/layer.conf b/meta-lenovo/meta-hr630/conf/layer.conf
index 58bf5269c..9c1b4d652 100644
--- a/meta-lenovo/meta-hr630/conf/layer.conf
+++ b/meta-lenovo/meta-hr630/conf/layer.conf
@@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "hr630-layer"
 BBFILE_PATTERN_hr630-layer = ""
 BBFILE_PRIORITY_hr630-layer = "5"
-LAYERSERIES_COMPAT_hr630-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_hr630-layer = "gatesgarth hardknott"
diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 507954d49..7a2345ebc 100644
--- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -2,7 +2,7 @@
 #Licensed under BSD-3, see COPYING.BSD file for details."
 
 FILESEXTRAPATHS_prepend_hr630 := "${THISDIR}/${PN}:"
-EXTRA_OECONF_append_hr630 = " --enable-negative-errno-on-fail"
+EXTRA_OEMESON_append_hr630 = " -Dnegative-errno-on-fail=true"
 
 CHIPS = " \
         bus@1e78a000/i2c-bus@40/tmp75@4e \
diff --git a/meta-lenovo/meta-hr855xg2/conf/bblayers.conf.sample b/meta-lenovo/meta-hr855xg2/conf/bblayers.conf.sample
index a14ab61ea..744edb7e6 100644
--- a/meta-lenovo/meta-hr855xg2/conf/bblayers.conf.sample
+++ b/meta-lenovo/meta-hr855xg2/conf/bblayers.conf.sample
@@ -12,8 +12,10 @@ BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-x86 \
diff --git a/meta-lenovo/meta-hr855xg2/conf/layer.conf b/meta-lenovo/meta-hr855xg2/conf/layer.conf
index 8402ee9f0..364143298 100644
--- a/meta-lenovo/meta-hr855xg2/conf/layer.conf
+++ b/meta-lenovo/meta-hr855xg2/conf/layer.conf
@@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "hr855xg2-layer"
 BBFILE_PATTERN_hr855xg2-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_hr855xg2-layer = "5"
-LAYERSERIES_COMPAT_hr855xg2-layer = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_hr855xg2-layer = "gatesgarth hardknott"