Merge pull request #72 from Intel-BMC/update2021-0.751-0.75

Update

8 files changed, 63 insertions, 63 deletions

diff --git a/meta-openbmc-mods/meta-wht/conf/layer.conf b/meta-openbmc-mods/meta-wht/conf/layer.conf
index a639b642b..1724b07f0 100644
--- a/meta-openbmc-mods/meta-wht/conf/layer.conf
+++ b/meta-openbmc-mods/meta-wht/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "wht"
 BBFILE_PATTERN_wht = "^${LAYERDIR}/"
 BBFILE_PRIORITY_wht = "11"
-LAYERSERIES_COMPAT_wht = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_wht = "gatesgarth hardknott honister"
 
 PRODUCT_GENERATION = "wht"
diff --git a/meta-openbmc-mods/meta-wht/conf/local.conf.sample b/meta-openbmc-mods/meta-wht/conf/local.conf.sample
index 5e6ed9fb3..202c5bca7 100644
--- a/meta-openbmc-mods/meta-wht/conf/local.conf.sample
+++ b/meta-openbmc-mods/meta-wht/conf/local.conf.sample
@@ -3,11 +3,11 @@ MACHINE ??= "intel-ast2500"
 #SSTATE_DIR ?= "/~YoctoSstate-cache"
 DISTRO ?= "openbmc-phosphor"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
+SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*"
 EXTRA_IMAGE_FEATURES = "validation-unsecure"
 # Uncomment the following line to enable debug features / default user account.
 #EXTRA_IMAGE_FEATURES += "debug-tweaks"
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 PATCHRESOLVE = "noop"
 
 # PFR image Build
@@ -15,7 +15,7 @@ PATCHRESOLVE = "noop"
 # for building Intel PFR compliant images.
 #IMAGE_FSTYPES += "intel-pfr"
 
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
diff --git a/meta-openbmc-mods/meta-wht/recipes-core/host-error-monitor/host-error-monitor_%.bbappend b/meta-openbmc-mods/meta-wht/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
index 638d833a8..14b3885cb 100644
--- a/meta-openbmc-mods/meta-wht/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
+++ b/meta-openbmc-mods/meta-wht/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
     file://0001-Configure-host-error-monitors-for-meta-wht.patch \
diff --git a/meta-openbmc-mods/meta-wht/recipes-core/libpeci/libpeci_%.bbappend b/meta-openbmc-mods/meta-wht/recipes-core/libpeci/libpeci_%.bbappend
index 575cfea24..c5716d9b1 100644
--- a/meta-openbmc-mods/meta-wht/recipes-core/libpeci/libpeci_%.bbappend
+++ b/meta-openbmc-mods/meta-wht/recipes-core/libpeci/libpeci_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
 
 SRC_URI += "file://99-peci.rules"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/lib/udev/rules.d
     install -m 0644 ${WORKDIR}/99-peci.rules ${D}/lib/udev/rules.d
 }
diff --git a/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bbappend b/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bbappend
index 55cc619ce..2955dabd3 100644
--- a/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bbappend
+++ b/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
 
-SRC_URI_append = " \
+SRC_URI:append = " \
            file://pfr_manifest.json \
            file://pfm_config.xml \
            file://bmc_config.xml \
@@ -10,7 +10,7 @@ SRC_URI_append = " \
            file://rk_prv.pem \
           "
 
-do_install_append () {
+do_install:append () {
         install -m 400 ${WORKDIR}/pfr_manifest.json ${D}/${datadir}/pfrconfig
         install -m 400 ${WORKDIR}/pfm_config.xml ${D}/${datadir}/pfrconfig/pfm_config.xml
         install -m 400 ${WORKDIR}/bmc_config.xml ${D}/${datadir}/pfrconfig/bmc_config.xml
diff --git a/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native/bmc_config.xml b/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native/bmc_config.xml
index 9e7d3f82d..36a35b447 100644
--- a/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native/bmc_config.xml
+++ b/meta-openbmc-mods/meta-wht/recipes-intel/intel-pfr/obmc-intel-pfr-image-native/bmc_config.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- XML file for Block Sign Tool -->

-<blocksign>

-  <version>1</version>

-  <!-- Block 0 -->

-  <block0>

-    <magic>0xB6EAFD19</magic>

-    <pctype>4</pctype>

-  </block0>

-  <!-- Block 1 -->

-  <block1>

-    <magic>0xF27F28D7</magic>

-    <!-- Root key -->

-    <rkey>

-      <magic>0xA757A046</magic>

-      <curvemagic>0xC7B88C74</curvemagic>

-      <permissions>-1</permissions>

-      <keyid>-1</keyid>

-      <pubkey>rk_pub.pem</pubkey>

-    </rkey>

-    <!-- Code signing key -->

-    <cskey>

-      <magic>0x14711C2F</magic>

-      <curvemagic>0xC7B88C74</curvemagic>

-      <permissions>8</permissions>

-      <keyid>1</keyid>

-      <pubkey>csk_pub.pem</pubkey>

-      <sigmagic>0xDE64437D</sigmagic>

-      <hashalg>sha256</hashalg>

-      <signkey>rk_prv.pem</signkey>

-      <!--<script>./sign_external.sh</script>-->

-    </cskey>

-    <!-- Signature over Block 0 -->

-    <b0_sig>

-      <magic>0x15364367</magic>

-      <sigmagic>0xDE64437D</sigmagic>

-      <hashalg>sha256</hashalg>

-      <signkey>csk_prv.pem</signkey>

-    </b0_sig>

-  </block1>

-  <!-- CPLD Bitstream Specific -->

-  <padding>

-    <!-- Pad block1 such that combined block length is 1024b -->

-    <blockpad>1024</blockpad>

-    <!-- Align total package to 128 bytes -->

-    <align>128</align>

-  </padding>

-</blocksign>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- XML file for Block Sign Tool -->
+<blocksign>
+  <version>1</version>
+  <!-- Block 0 -->
+  <block0>
+    <magic>0xB6EAFD19</magic>
+    <pctype>4</pctype>
+  </block0>
+  <!-- Block 1 -->
+  <block1>
+    <magic>0xF27F28D7</magic>
+    <!-- Root key -->
+    <rkey>
+      <magic>0xA757A046</magic>
+      <curvemagic>0xC7B88C74</curvemagic>
+      <permissions>-1</permissions>
+      <keyid>-1</keyid>
+      <pubkey>rk_pub.pem</pubkey>
+    </rkey>
+    <!-- Code signing key -->
+    <cskey>
+      <magic>0x14711C2F</magic>
+      <curvemagic>0xC7B88C74</curvemagic>
+      <permissions>8</permissions>
+      <keyid>1</keyid>
+      <pubkey>csk_pub.pem</pubkey>
+      <sigmagic>0xDE64437D</sigmagic>
+      <hashalg>sha256</hashalg>
+      <signkey>rk_prv.pem</signkey>
+      <!--<script>./sign_external.sh</script>-->
+    </cskey>
+    <!-- Signature over Block 0 -->
+    <b0_sig>
+      <magic>0x15364367</magic>
+      <sigmagic>0xDE64437D</sigmagic>
+      <hashalg>sha256</hashalg>
+      <signkey>csk_prv.pem</signkey>
+    </b0_sig>
+  </block1>
+  <!-- CPLD Bitstream Specific -->
+  <padding>
+    <!-- Pad block1 such that combined block length is 1024b -->
+    <blockpad>1024</blockpad>
+    <!-- Align total package to 128 bytes -->
+    <align>128</align>
+  </padding>
+</blocksign>
diff --git a/meta-openbmc-mods/meta-wht/recipes-phosphor/fru/default-fru.bbappend b/meta-openbmc-mods/meta-wht/recipes-phosphor/fru/default-fru.bbappend
index 3251758e9..f9150385d 100644
--- a/meta-openbmc-mods/meta-wht/recipes-phosphor/fru/default-fru.bbappend
+++ b/meta-openbmc-mods/meta-wht/recipes-phosphor/fru/default-fru.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://decodeBoardID.sh"
+SRC_URI:append = " file://decodeBoardID.sh"
diff --git a/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 03c685d1d..c088629fa 100644
--- a/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://ipmb-channels.json"
+SRC_URI:append = " file://ipmb-channels.json"
 
-do_install_append(){
+do_install:append(){
     install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
                    ${D}/usr/share/ipmbbridge/
 }