Update to internal

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

12 files changed, 62 insertions, 193 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 de30d52b7..0cf8ed0f0 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
@@ -13,7 +13,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
 
-SRCREV = "c4c223bdbe5b58a7acad12dc9700365330f2df1c"
+SRCREV = "e3ef64c6427f7be7c9cd6aa4cd696dd5c33f5085"
 S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/fstab b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/fstab
index 8d65eb990..0b53093ae 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/fstab
+++ b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/fstab
@@ -2,6 +2,8 @@
 proc                 /proc                           proc       defaults              0  0
 devpts               /dev/pts                        devpts     mode=0620,gid=5       0  0
 tmpfs                /run                            tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
+tmpfs                /var/lib/systemd/coredump       tmpfs      rw,nosuid,nodev,size=67108864 0  0
+tmpfs                /media                          tmpfs      rw                    0  0
 
 # uncomment this if your device has a SD/MMC/Transflash slot
 #/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
diff --git a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend
deleted file mode 100644
index 7f07e48ea..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-# add a user called bmcweb for the server to assume
-# bmcweb is part of group shadow for non-root pam authentication
-USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin -d /home/bmcweb -m -G shadow bmcweb"
-
-GROUPADD_PARAM_${PN} = "web; redfish "
-
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-# Enable CPU Log and Raw PECI support
-EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_CPU_LOG=ON"
-EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_RAW_PECI=ON"
-
-# Enable Redfish BMC Journal support
-EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_BMC_JOURNAL=ON"
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/cpu-log-util/cpu-log-util_git.bb
index 8419fb483..170412e0c 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/cpu-log-util/cpu-log-util_git.bb
@@ -11,7 +11,7 @@ LICENSE = "CLOSED"
 LIC_FILES_CHKSUM = ""
 
 SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
-SRCREV = "c4c223bdbe5b58a7acad12dc9700365330f2df1c"
+SRCREV = "e3ef64c6427f7be7c9cd6aa4cd696dd5c33f5085"
 
 S = "${WORKDIR}/git/cpu-log-util"
 PACKAGES += "libpeci"
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 5526d9c6b..e0f4d5d2b 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 = "7086a88cfe94db15233bae450b3a03d3566bca68"
+SRCREV = "7944c3072287a3833a29283aafa8650a31cd4ce7"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.service b/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.service
deleted file mode 100644
index 95957591f..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Non-volatile overlay
-
-Before=sysinit.target systemd-sysctl.service systemd-modules-load.service swap.target systemd-tmpfiles-setup.service
-DefaultDependencies=no
-Conflicts=shutdown.target
-ConditionFileNotEmpty={bindir}/nv-overlay.sh
-
-[Service]
-Type=oneshot
-ExecStart={bindir}/nv-overlay.sh
-
-[Install]
-RequiredBy=paths.target
-
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.sh b/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.sh
deleted file mode 100755
index cde082013..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-
-# Copyright 2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-# provide a couple of places in the RO root filesystem
-# that can be made RW with an overlayfs
-
-# start with /proc and /tmp mounted
-[ -e /proc/mounts ] || mount -t proc proc /proc
-grep -q /tmp /proc/mounts || mount -t tmpfs -o rw,nosuid,nodev tmp /tmp
-
-# list of things that need to be rw at boot
-NV_OVERLAYS="/etc /var /home"
-TMP_FS="/var/log /var/lib/systemd/coredump /media"
-
-# place to mount the real jffs2 backing store
-RWFS_MNT=/tmp/.rwfs
-
-if grep -q "$RWFS_MNT" /proc/mounts; then
-    # quit - we have already run
-    exit 0
-fi
-mkdir -p "$RWFS_MNT"
-
-mtd_by_name() {
-    local name="$1"
-    local mtd="/dev/$(grep "$name" /proc/mtd | cut -d : -f 1)"
-    echo "$mtd"
-}
-
-mtdblock_by_name() {
-    local name="$1"
-    local mtdblock="$(mtd_by_name "$name" | sed 's,mtd,mtdblock,')"
-    echo "$mtdblock"
-}
-
-NV_MTD=rwfs
-NV_MTD_DEV="$(mtd_by_name ${NV_MTD})"
-NV_MTD_BLOCKDEV="$(mtdblock_by_name ${NV_MTD})"
-
-nvrw() {
-    local p="$1"
-    mkdir -p "${RWFS_MNT}${p}" "${RWFS_MNT}${p}.work"
-    local mname=$(echo "rwnv${p}" | sed 's,/,,g')
-    local opts="lowerdir=${p},upperdir=${RWFS_MNT}${p},workdir=${RWFS_MNT}${p}.work"
-    mount -t overlay -o "$opts" "$mname" "$p"
-}
-
-targetted_clean() {
-    local LOG_TAG="restore-defaults"
-    # Do not delete server certificates for the web server or ssh
-    echo "removing targetted contents:"
-    cd "${RWFS_MNT}/etc"
-    for file in *; do
-        case $file in
-            # The only files that stay are here:
-            CA|RestoreDefaultConfiguration|dropbear|sdr|server.pem);;
-            # All else get removed.
-            *)  echo "remove $file"
-                rm -rf $file;;
-        esac
-    done
-    # nothing should be in the workdir, but clear it just in case
-    rm -rf "${RWFS_MNT}/etc.work"
-
-    # Log files remaining - but not to stdout.
-    echo "Files remaining: $(ls)"
-
-    # clean everything out of /var
-    rm -rf "${RWFS_MNT}/var" "${RWFS_MNT}/var.work"
-}
-
-full_clean() {
-    local OVL=''
-    for OVL in $NV_OVERLAYS; do
-        rm -rf "${RWFS_MNT}${OVL}" "${RWFS_MNT}${OVL}.work"
-    done
-}
-
-# check for full factory reset: if so, flash_eraseall $NV_MTD_DEV
-bootflags="0x$(sed 's/^.*bootflags=\([0-9a-f]*\).*$/\1/' /proc/cmdline)"
-let "restore_op = $bootflags & 0x3"
-if [ $restore_op -eq 3 ]; then
-    flash_eraseall "$NV_MTD_DEV"
-fi
-
-mount -t jffs2 "$NV_MTD_BLOCKDEV" "$RWFS_MNT"
-
-if [ $restore_op -eq 1 ]; then
-    targetted_clean
-elif [ $restore_op -eq 2 ]; then
-    full_clean
-fi
-
-for FS in $NV_OVERLAYS; do
-    nvrw "$FS"
-done
-
-for FS in $TMP_FS; do
-    mount -t tmpfs tmpfs "$FS"
-done
-
-# make sure that /etc/fw_env.config mirrors our current uboot environment
-UENV_MTD_INFO=$(grep UENV /proc/mtd)
-if [ -n "$UENV_MTD_INFO" ]; then
-    UENV_MTD_INFO=$(echo "$UENV_MTD_INFO" | sed 's,^\([^:]*\): \([0-9a-f]*\) \([0-9a-f]*\) .*,/dev/\1 0 0x\2 0x\3,')
-    if ! grep -q "^${UENV_MTD_INFO}$" /etc/fw_env.config; then
-        echo "${UENV_MTD_INFO}" > /etc/fw_env.config
-        echo "Updated fw_env.config"
-    fi
-fi
-
-# work around bug where /etc/machine-id will be mounted with a temporary file
-# if rootfs is read-only and the file is empty
-MACHINE_ID=/etc/machine-id
-if [ ! -s "$MACHINE_ID" ]; then
-    systemd-machine-id-setup
-fi
-
-# mount persistent NV filesystem, where immortal settings live
-if ! grep -q sofs /proc/mounts; then
-    mkdir -p /var/sofs
-    SOFS_MTD=sofs
-    SOFS_MTD_BLOCKDEV="$(mtdblock_by_name ${SOFS_MTD})"
-    mount -t jffs2 "$SOFS_MTD_BLOCKDEV" /var/sofs
-fi
-
-echo "Finished mounting non-volatile overlays"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/nv-overlay.bb b/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/nv-overlay.bb
deleted file mode 100644
index 78b0f80ca..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/nv-overlay.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Limited NV overlay init script"
-DESCRIPTION = "At runtime, overlay a few directories with an NV COW"
-PR = "r1"
-
-inherit obmc-phosphor-systemd
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRC_URI += "file://nv-overlay.sh"
-SRC_URI += "file://nv-overlay.service"
-
-do_install_append() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/nv-overlay.sh ${D}${bindir}
-}
-
-TMPL = "nv-overlay.service"
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
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 2e89c27c1..dec71e0d6 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
@@ -10,7 +10,7 @@ SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh"
 DEPENDS = "boost sdbusplus cpu-log-util"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "c927781ad3ca1408cd7fb0b7cc2538ea10ded76b"
+SRCREV = "f4d4bfc3296cb27feb17aa5d1d93b3061b56ce10"
 
 S = "${WORKDIR}/git/peci_pcie"
 
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
new file mode 100644
index 000000000..8f26d784b
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://journald.conf \
+            file://systemd-timesyncd-save-time.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
+}
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
new file mode 100644
index 000000000..5d4134cbd
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/journald.conf
@@ -0,0 +1,42 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See journald.conf(5) for details.
+
+[Journal]
+Storage=persistent
+#Compress=yes
+#Seal=yes
+#SplitMode=uid
+#SyncIntervalSec=5m
+#RateLimitIntervalSec=30s
+#RateLimitBurst=10000
+SystemMaxUse=6M
+#SystemKeepFree=
+SystemMaxFileSize=512K
+# SystemMaxFiles=32
+#RuntimeMaxUse=32M
+#RuntimeKeepFree=
+#RuntimeMaxFileSize=
+#RuntimeMaxFiles=4
+#MaxRetentionSec=
+#MaxFileSec=1month
+#ForwardToSyslog=no
+#ForwardToKMsg=no
+#ForwardToConsole=no
+#ForwardToWall=yes
+#TTYPath=/dev/console
+MaxLevelStore=notice
+#MaxLevelSyslog=debug
+#MaxLevelKMsg=notice
+#MaxLevelConsole=info
+#MaxLevelWall=emerg
+#LineMax=48K
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/systemd-timesyncd-save-time.conf b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/systemd-timesyncd-save-time.conf
new file mode 100644
index 000000000..aa455cbcb
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf/systemd-timesyncd-save-time.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStop=touch /var/lib/systemd/timesync/clock
\ No newline at end of file