Update to internal 0.26

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

15 files changed, 48 insertions, 94 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb
index 6e3e0c4de..77f171095 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb
@@ -13,7 +13,7 @@ DEPENDS = "sdbusplus openssl libpam libgpiod safec"
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 SRC_URI = "git://github.com/Intel-BMC/asd;protocol=git"
-SRCREV = "1.4.3"
+SRCREV = "1.4.4"
 
 inherit useradd
 
diff --git a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
deleted file mode 100644
index 1a1a83dce..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-inherit obmc-phosphor-dbus-service
-inherit obmc-phosphor-systemd
-
-SUMMARY = "CPU Crashdump"
-DESCRIPTION = "CPU utilities for dumping CPU Crashdump and registers over PECI"
-
-DEPENDS = "boost cjson sdbusplus safec gtest libpeci"
-inherit cmake
-
-EXTRA_OECMAKE = "-DYOCTO_DEPENDENCIES=ON -DCRASHDUMP_BUILD_UT=OFF"
-
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=43c09494f6b77f344027eea0a1c22830"
-
-SRC_URI = "git://github.com/Intel-BMC/crashdump;protocol=git"
-SRCREV = "wht-0.9"
-
-S = "${WORKDIR}/git"
-
-SYSTEMD_SERVICE_${PN} += "com.intel.crashdump.service"
-DBUS_SERVICE_${PN} += "com.intel.crashdump.service"
-
-# linux-libc-headers guides this way to include custom uapi headers
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/crashdump/files/com.intel.crashdump.service b/meta-openbmc-mods/meta-common/recipes-core/crashdump/files/com.intel.crashdump.service
deleted file mode 100644
index 6f79573f0..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/crashdump/files/com.intel.crashdump.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Intel BMC CPU Crashdump
-
-[Service]
-Restart=always
-ExecStart={bindir}/crashdump
-Type=simple
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
index 869cf5f2f..a5b5ee429 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
@@ -1,5 +1,4 @@
-# Enable downstream autobump
-#SRC_URI = "git://github.com/openbmc/host-error-monitor"
-SRCREV = "2fbb9eadeda2ae8a77ac53346b53f2d0a72f3e74"
+SRC_URI  = "git://github.com/openbmc/host-error-monitor"
+SRCREV = "c90570ab1ad57ac824edf7b5d0f8a89afbcf0c09"
 
 EXTRA_OECMAKE = "-DYOCTO=1"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
index 093419202..b9e1411bc 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "libmctp"
 DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)"
 
 SRC_URI = "git://github.com/openbmc/libmctp.git"
-SRCREV = "96d5449211228c141b65dbe60a121c23f6c79cfb"
+SRCREV = "c2b833e40ddb858a94734f77a0bd761b76733c65"
 
 PV = "0.1+git${SRCPV}"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
index cd2011b4a..ff3387bf6 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
@@ -2,4 +2,4 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PF
 EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}"
 EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF"
 SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git"
-SRCREV = "04a38ed10db3a0203aa7804bfea6fbd69dafdde8"
+SRCREV = "aedf5a9efe124853b3c722e155fea931befce89d"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_%.bbappend
index 2bb0dcd30..55cfcc00c 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_%.bbappend
@@ -1,3 +1,3 @@
 # Enable downstream autobump
 SRC_URI = "git://github.com/openbmc/libpeci"
-SRCREV = "c965e72c6765e054531c1ab91e7fa13f04651f21"
+SRCREV = "bc641112abc99b4a972665aa984023a6713a21ac"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service
index bad3329d3..4595541c6 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service
@@ -2,10 +2,8 @@
 Description=Overlay sync to NV storage
 
 [Service]
-# Run rsync periodically to sync the overlay to NV storage
-ExecStart=bash -c 'while true; do rsync -a --delete /tmp/.overlay/ /tmp/.rwfs/.overlay; sync /tmp/.rwfs/.overlay; sleep 10; done'
-# On shutdown, archive the bash history so we don't lose it and run one last sync
-ExecStop=bash -c 'history -a; rsync -a --delete /tmp/.overlay/ /tmp/.rwfs/.overlay; sync /tmp/.rwfs/.overlay; sleep 5'
+# Run a job to periodically sync the overlay to NV storage
+ExecStart=/usr/bin/nv-syncd
 # Due to sync delay stopping this service will take more than default 10 seconds
 TimeoutStopSec=20
 
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd
new file mode 100644
index 000000000..e2bb4bb0c
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+NVMP=/tmp/.rwfs
+SOMP=/var/sofs
+
+do_sync() {
+    rsync -a --delete /tmp/.overlay/ $NVMP/.overlay
+    sync $NVMP/.overlay
+}
+
+stop_nv() {
+    history -a
+    do_sync
+    mount -o remount,ro $NVMP
+    mount -o remount,ro $SOMP
+    exit 0
+}
+
+# register cleanup function
+trap stop_nv SIGINT
+trap stop_nv SIGTERM
+trap stop_nv EXIT
+
+# make sure the mount points are RW
+mount -o remount,rw $NVMP
+mount -o remount,rw $SOMP
+
+# Run rsync periodically to sync the overlay to NV storage
+while true; do
+    do_sync
+    sleep 10
+done
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb
index 0ee70e880..420fc258b 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "Script to periodically sync the overlay to NV storage"
 
 S = "${WORKDIR}"
 SRC_URI = "file://nv-sync.service \
+           file://nv-syncd \
 "
 
 LICENSE = "Apache-2.0"
@@ -10,11 +11,15 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe
 
 inherit systemd
 
+RDEPENDS_${PN} += "bash"
+
 FILES_${PN} += "${systemd_system_unitdir}/nv-sync.service"
 
 do_install() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/nv-sync.service ${D}${systemd_system_unitdir}
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/nv-syncd ${D}${bindir}/nv-syncd
 }
 
 SYSTEMD_SERVICE_${PN} += " nv-sync.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
index a47d923f8..ba95727b4 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
@@ -9,6 +9,8 @@ require version-vars.inc
 
 OS_RELEASE_FIELDS_append = " OPENBMC_VERSION IPMI_MAJOR IPMI_MINOR IPMI_AUX13 IPMI_AUX14 IPMI_AUX15 IPMI_AUX16"
 
+OS_RELEASE_FIELDS_remove = "BUILD_ID"
+
 python do_compile_append () {
     import glob
     with open(d.expand('${B}/os-release'), 'a') as f:
diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb
deleted file mode 100644
index 469fb5f57..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-# NOTE: LICENSE is being set to "CLOSED" for now.  The PCIe reads over PECI expose
-# more information than is accessible from the BIOS or OS, so we need to keep this
-# internal to Intel until it's resolved.
-LICENSE = "CLOSED"
-LIC_FILES_CHKSUM = ""
-inherit cmake systemd
-
-SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
-
-DEPENDS = "boost sdbusplus libpeci"
-
-PV = "0.1+git${SRCPV}"
-SRCREV = "98c33cdb7d704a387edee4ac8f0ef98ea771b222"
-
-S = "${WORKDIR}/git/peci_pcie"
-
-SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.PCIe.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb b/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb
index 449dcf04d..d6de78175 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb
@@ -7,7 +7,7 @@ SECTION = "lib"
 inherit autotools pkgconfig
 
 S = "${WORKDIR}/git"
-SRCREV = "a7da29dadadde04feec174f595b59d67a64f3956"
+SRCREV = "0234bec46da4863f849f100c2f5336412ab2f69b"
 SRC_URI = "git://github.com/rurban/safeclib.git"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64).*-linux'
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0002-Disable-LLMNR-port-5355.patch b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0002-Disable-LLMNR-port-5355.patch
deleted file mode 100644
index 8b978e4fb..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0002-Disable-LLMNR-port-5355.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9fb05323291ccdfbf19ac0d9428e366d6023b408 Mon Sep 17 00:00:00 2001
-From: Karthick Sundarrajan <karthick.sundarrajan@intel.com>
-Date: Fri, 3 Apr 2020 10:23:41 -0700
-Subject: [PATCH] Disable LLMNR (port 5355)
-
-As part of OS hardening process, the port has to be
-disabled.
-
-Signed-off-by: Karthick Sundarrajan <karthick.sundarrajan@intel.com>
----
- src/resolve/resolved.conf.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
-index 6898c78..a9125fd 100644
---- a/src/resolve/resolved.conf.in
-+++ b/src/resolve/resolved.conf.in
-@@ -15,7 +15,7 @@
- #DNS=
- #FallbackDNS=@DNS_SERVERS@
- #Domains=
--#LLMNR=yes
-+LLMNR=no
- #MulticastDNS=yes
- #DNSSEC=@DEFAULT_DNSSEC_MODE@
- #DNSOverTLS=@DEFAULT_DNS_OVER_TLS_MODE@
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
index 985a9e5ba..ac5fcee66 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
@@ -5,7 +5,6 @@ LICENSE = "GPL-2.0"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch \
-            file://0002-Disable-LLMNR-port-5355.patch \
             file://systemd-time-wait-sync.service \
            "