Update to internal

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

9 files changed, 28 insertions, 26 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
index 4b445ce0f..fd71e0abf 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
@@ -3,17 +3,18 @@ inherit obmc-phosphor-systemd
 SUMMARY = "At Scale Debug Service"
 DESCRIPTION = "At Scale Debug Service exposes remote JTAG target debug capabilities"
 
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=40c94c59cbbc218afdd64eec899ad2f6"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0d1c657b2ba1e8877940a8d1614ec560"
+
 
 inherit cmake
 DEPENDS = "sdbusplus openssl libpam"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
-SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
+SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
 
-SRCREV = "71a38355f46ee52620be7304c3712a47c00dad1e"
+SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d"
 S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service"
@@ -21,4 +22,5 @@ SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service"
 # Specify any options you want to pass to cmake using EXTRA_OECMAKE:
 EXTRA_OECMAKE = "-DBUILD_UT=OFF"
 
+CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
 CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
index 1d2a6e9df..bbf4f0183 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
@@ -1,8 +1,8 @@
 inherit obmc-phosphor-dbus-service
 inherit obmc-phosphor-systemd
 
-SUMMARY = "CPU Log Utils"
-DESCRIPTION = "CPU utilities for dumping CPU registers over PECI"
+SUMMARY = "CPU Crashdump"
+DESCRIPTION = "CPU utilities for dumping CPU Crashdump and registers over PECI"
 
 DEPENDS = "boost cjson sdbusplus "
 inherit cmake
@@ -10,14 +10,14 @@ inherit cmake
 LICENSE = "CLOSED"
 LIC_FILES_CHKSUM = ""
 
-SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
-SRCREV = "71a38355f46ee52620be7304c3712a47c00dad1e"
+SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
+SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d"
 
-S = "${WORKDIR}/git/cpu-log-util"
+S = "${WORKDIR}/git/crashdump"
 PACKAGES += "libpeci"
 
-SYSTEMD_SERVICE_${PN} += "com.intel.CpuDebugLog.service"
-DBUS_SERVICE_${PN} += "com.intel.CpuDebugLog.service"
+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"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/files/com.intel.CpuDebugLog.service b/meta-openbmc-mods/meta-common/recipes-core/crashdump/files/com.intel.crashdump.service
index 13d2c860e..6f79573f0 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/files/com.intel.CpuDebugLog.service
+++ b/meta-openbmc-mods/meta-common/recipes-core/crashdump/files/com.intel.crashdump.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Intel BMC CPU Debug Log
+Description=Intel BMC CPU Crashdump
 
 [Service]
 Restart=always
-ExecStart={bindir}/cpu_log
+ExecStart={bindir}/crashdump
 Type=simple
 
 [Install]
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 8e06bcbf2..01cc72e69 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
@@ -1,2 +1,2 @@
 SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git"
-SRCREV = "acc8a4ebf38231765175fe30a075c62643983748"
+SRCREV = "1f2eb5eac4a75a219ece15850a3c2dfc0fdc5991"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
index 39bf2b966..d4ad9c4e6 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Intel IPMI Providers"
 DESCRIPTION = "IPMI Provider Libraries"
 
-SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh"
-SRCREV = "91d0178dc4fe513cdfd0e3d52e5eb41193b2bf57"
+SRC_URI = "git://github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh"
+SRCREV = "3f8aa7959d2e8475e50743d32ff178257aafc1e7"
 
 S = "${WORKDIR}/git"
 PV = "0.1+git${SRCPV}"
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
index 71909e69c..506484311 100644
--- 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
@@ -5,12 +5,12 @@ LICENSE = "CLOSED"
 LIC_FILES_CHKSUM = ""
 inherit cmake systemd
 
-SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh"
+SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
 
-DEPENDS = "boost sdbusplus cpu-log-util"
+DEPENDS = "boost sdbusplus crashdump"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "785f19b128794611574ea6c18805740fb851ecff"
+SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d"
 
 S = "${WORKDIR}/git/peci_pcie"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/obmc-targets.bbappend
index 3fe1c3f38..3d4e594a4 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/obmc-targets.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/obmc-targets.bbappend
@@ -1,6 +1,7 @@
 # Remove these files since they are provided by obmc-intel-targets
 SYSTEMD_SERVICE_${PN}_remove += " obmc-host-start@.target"
 SYSTEMD_SERVICE_${PN}_remove += " obmc-host-stop@.target"
+SYSTEMD_SERVICE_${PN}_remove += " obmc-host-shutdown@.target"
 SYSTEMD_SERVICE_${PN}_remove += " obmc-host-reboot@.target"
 SYSTEMD_SERVICE_${PN}_remove += " obmc-host-startmin@.target"
 SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweron@.target"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/journald.conf b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/journald.conf
index 5d4134cbd..48c60d36b 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/journald.conf
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/journald.conf
@@ -12,18 +12,18 @@
 # See journald.conf(5) for details.
 
 [Journal]
-Storage=persistent
+Storage=volatile
 #Compress=yes
 #Seal=yes
 #SplitMode=uid
 #SyncIntervalSec=5m
 #RateLimitIntervalSec=30s
 #RateLimitBurst=10000
-SystemMaxUse=6M
+#SystemMaxUse=6M
 #SystemKeepFree=
-SystemMaxFileSize=512K
-# SystemMaxFiles=32
-#RuntimeMaxUse=32M
+#SystemMaxFileSize=512K
+#SystemMaxFiles=32
+RuntimeMaxUse=32M
 #RuntimeKeepFree=
 #RuntimeMaxFileSize=
 #RuntimeMaxFiles=4
@@ -34,7 +34,7 @@ SystemMaxFileSize=512K
 #ForwardToConsole=no
 #ForwardToWall=yes
 #TTYPath=/dev/console
-MaxLevelStore=notice
+#MaxLevelStore=notice
 #MaxLevelSyslog=debug
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend
index 8f26d784b..b3c318e15 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend
@@ -7,6 +7,5 @@ SRC_URI += "file://journald.conf \
 FILES_${PN} += " ${systemd_system_unitdir}/systemd-timesyncd.service.d/systemd-timesyncd-save-time.conf"
 
 do_install_append() {
-        install -m 644 -D ${WORKDIR}/journald.conf ${D}${sysconfdir}/systemd/journald.conf
         install -m 644 -D ${WORKDIR}/systemd-timesyncd-save-time.conf ${D}${systemd_system_unitdir}/systemd-timesyncd.service.d/systemd-timesyncd-save-time.conf
 }