Initial commit of intel repository

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

27 files changed, 886 insertions, 0 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
new file mode 100644
index 000000000..8d4a67ec5
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
@@ -0,0 +1,24 @@
+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"
+
+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"
+
+SRCREV = "de77d02aefa3c9df62365e7f07224c5cf9b0eb96"
+S = "${WORKDIR}/git"
+
+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/"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/com.intel.AtScaleDebug.service b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/com.intel.AtScaleDebug.service
new file mode 100644
index 000000000..65d83b4c4
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/com.intel.AtScaleDebug.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Intel BMC At Scale Debug
+Requires=com.intel.AtScaleDebugJtagTest.service network-online.target
+
+[Service]
+Restart=always
+RestartSec=30
+ExecStart={bindir}/asd -k /home/root/server.pem
+Type=simple
+SyslogIdentifier=asd
+
+[Install]
+WantedBy=obmc-host-start@0.target
diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/com.intel.AtScaleDebugJtagTest.service b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/com.intel.AtScaleDebugJtagTest.service
new file mode 100644
index 000000000..281d1a993
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/com.intel.AtScaleDebugJtagTest.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Intel BMC At Scale Debug JTAG test to check if remote debug setting is enabled
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/sleep 10
+ExecStart={bindir}/jtag_test
+SyslogIdentifier=jtag_test
+RemainAfterExit=true
+
+[Install]
+WantedBy=obmc-host-start@0.target
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
new file mode 100644
index 000000000..8d65eb990
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/fstab
@@ -0,0 +1,8 @@
+/dev/root            /                               auto       defaults              1  1
+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
+
+# 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/base-files/base-files_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 000000000..79e529179
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://fstab"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch
new file mode 100644
index 000000000..acbfebdee
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch
@@ -0,0 +1,119 @@
+From 430bfc33ee396e4aced0514b66703e5c58a7503d Mon Sep 17 00:00:00 2001
+From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+Date: Tue, 26 Feb 2019 15:46:07 -0800
+Subject: [PATCH] Refine KVM websock proxy
+
+This commit simplifies input buffer delivering logic by removing
+a doWrite() call from readDone(). Input events can be delivered
+through websocket's onmessage handler only and it's enough.
+
+Also, it fixes a suspicious weak point of commit/consume pair on
+outputBuffer.
+
+Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+---
+ include/kvm_websocket.hpp | 57 +++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 31 deletions(-)
+
+diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
+index aa2eaecc3205..447171b9981a 100644
+--- a/include/kvm_websocket.hpp
++++ b/include/kvm_websocket.hpp
+@@ -20,53 +20,48 @@ static boost::beast::flat_static_buffer<1024U> inputBuffer;
+ 
+ static crow::websocket::Connection* session = nullptr;
+ 
+-static bool doingWrite = false;
++inline void doWrite();
+ 
+-inline void doWrite()
++inline void WriteDone(const boost::system::error_code& ec,
++                      std::size_t bytesWritten)
+ {
+-    if (doingWrite)
++    BMCWEB_LOG_DEBUG << "Wrote " << bytesWritten << "bytes";
++    inputBuffer.consume(bytesWritten);
++
++    if (session == nullptr)
++    {
++        return;
++    }
++    if (ec == boost::asio::error::eof)
++    {
++        session->close("KVM socket port closed");
++        return;
++    }
++    if (ec)
+     {
+-        BMCWEB_LOG_DEBUG << "Already writing.  Bailing out";
++        session->close("Error in reading to host port");
++        BMCWEB_LOG_ERROR << "Error in KVM socket write " << ec;
+         return;
+     }
++
++    doWrite();
++}
++
++inline void doWrite()
++{
+     if (inputBuffer.size() == 0)
+     {
+         BMCWEB_LOG_DEBUG << "inputBuffer empty.  Bailing out";
+         return;
+     }
+ 
+-    doingWrite = true;
+-    hostSocket->async_write_some(
+-        inputBuffer.data(),
+-        [](boost::beast::error_code ec, std::size_t bytes_written) {
+-            BMCWEB_LOG_DEBUG << "Wrote " << bytes_written << "bytes";
+-            doingWrite = false;
+-            inputBuffer.consume(bytes_written);
+-
+-            if (session == nullptr)
+-            {
+-                return;
+-            }
+-            if (ec == boost::asio::error::eof)
+-            {
+-                session->close("KVM socket port closed");
+-                return;
+-            }
+-            if (ec)
+-            {
+-                session->close("Error in reading to host port");
+-                BMCWEB_LOG_ERROR << "Error in KVM socket write " << ec;
+-                return;
+-            }
+-            doWrite();
+-        });
++    hostSocket->async_write_some(inputBuffer.data(), WriteDone);
+ }
+ 
+ inline void doRead();
+ 
+ inline void readDone(const boost::system::error_code& ec, std::size_t bytesRead)
+ {
+-    outputBuffer.commit(bytesRead);
+     BMCWEB_LOG_DEBUG << "read done.  Read " << bytesRead << " bytes";
+     if (ec)
+     {
+@@ -82,6 +77,7 @@ inline void readDone(const boost::system::error_code& ec, std::size_t bytesRead)
+         return;
+     }
+ 
++    outputBuffer.commit(bytesRead);
+     boost::beast::string_view payload(
+         static_cast<const char*>(outputBuffer.data().data()), bytesRead);
+     BMCWEB_LOG_DEBUG << "Sending payload size " << payload.size();
+@@ -112,7 +108,6 @@ inline void connectHandler(const boost::system::error_code& ec)
+         return;
+     }
+ 
+-    doWrite();
+     doRead();
+ }
+ 
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend
new file mode 100644
index 000000000..8d5a43c51
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend
@@ -0,0 +1,16 @@
+# 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}"
+
+SRC_URI += "file://0001-Refine-KVM-websock-proxy.patch"
+
+# 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
new file mode 100644
index 000000000..10793689b
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb
@@ -0,0 +1,27 @@
+inherit obmc-phosphor-dbus-service
+inherit obmc-phosphor-systemd
+
+SUMMARY = "CPU Log Utils"
+DESCRIPTION = "CPU utilities for dumping CPU registers over PECI"
+
+DEPENDS = "boost cjson sdbusplus "
+inherit cmake
+
+LICENSE = "CLOSED"
+LIC_FILES_CHKSUM = ""
+
+SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
+SRCREV = "de77d02aefa3c9df62365e7f07224c5cf9b0eb96"
+
+S = "${WORKDIR}/git/cpu-log-util"
+PACKAGES += "libpeci"
+
+SYSTEMD_SERVICE_${PN} += "com.intel.CpuDebugLog.service"
+DBUS_SERVICE_${PN} += "com.intel.CpuDebugLog.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/cpu-log-util/files/com.intel.CpuDebugLog.service b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/files/com.intel.CpuDebugLog.service
new file mode 100644
index 000000000..13d2c860e
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/files/com.intel.CpuDebugLog.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Intel BMC CPU Debug Log
+
+[Service]
+Restart=always
+ExecStart={bindir}/cpu_log
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh
new file mode 100644
index 000000000..5a2637ba3
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+SSH_ID=$HOME/.ssh/id_rsa.db
+[ -e $HOME/.fwupd.defaults ] && source $HOME/.fwupd.defaults
+
+usage() {
+        echo "usage: $(basename $0) uri"
+        echo "       uri is something like: file:///path/to/fw"
+        echo "                              tftp://tftp.server.ip.addr/path/to/fw"
+        echo "                              scp://[user@]scp.server.ip.addr:/path/to/fw"
+        echo "                              http[s]://web.server.ip.addr/path/to/fw"
+        echo "                              ftp://[user@]ftp.server.ip.addr/path/to/fw"
+        exit 1
+}
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then usage; fi
+if [ $# -eq 0 ]; then
+	# set DEFURI in $HOME/.fwupd.defaults
+    URI="$DEFURI"
+else
+    URI="$1"
+fi
+
+PROTO=$(echo "$URI" | sed 's,\([a-z]*\)://.*$,\1,')
+REMOTE=$(echo "$URI" | sed 's,.*://\(.*\)$,\1,')
+REMOTE_HOST=$(echo "$REMOTE" | sed 's,\([^/]*\)/.*$,\1,')
+if [ "$PROTO" = 'scp' ]; then
+    REMOTE_PATH=$(echo "$REMOTE" | cut -d':' -f2)
+else
+    REMOTE_PATH=$(echo "$REMOTE" | sed 's,[^/]*/\(.*\)$,\1,')
+fi
+LOCAL_PATH="/tmp/$(basename $REMOTE_PATH)"
+echo "PROTO=$PROTO"
+echo "REMOTE=$REMOTE"
+echo "REMOTE_HOST=$REMOTE_HOST"
+echo "REMOTE_PATH=$REMOTE_PATH"
+if [ ! -e $LOCAL_PATH ] || [ $(stat -c %s $LOCAL_PATH) -eq 0 ]; then
+    echo "Download '$REMOTE_PATH' from $PROTO $REMOTE_HOST $REMOTE_PATH"
+    case "$PROTO" in
+        scp)
+            mkdir -p $HOME/.ssh
+            if [ -e "$SSH_ID" ]; then
+                ARG_ID="-i $SSH_ID"
+            fi
+            scp $ARG_ID $REMOTE_HOST$REMOTE_PATH $LOCAL_PATH
+            if [ $? -ne 0 ]; then
+                echo "scp $REMOTE $LOCAL_PATH failed!"
+                exit 255
+            fi
+            ;;
+        tftp)
+            cd /tmp
+            tftp -g -r "$REMOTE_PATH" "$REMOTE_HOST"
+            if [ $? -ne 0 ]; then
+                echo "tftp -g -r \"$REMOTE_PATH\" \"$REMOTE_HOST\" failed!"
+                exit 255
+            fi
+            ;;
+        http|https|ftp)
+            wget --no-check-certificate "$URI" -O "$LOCAL_PATH"
+            if [ $? -ne 0 ]; then
+                echo "wget $URI failed!"
+                exit 255
+            fi
+            ;;
+        file)
+            cp "$REMOTE_PATH" "$LOCAL_PATH"
+            ;;
+        *)
+            echo "Invalid URI $URI"
+            exit 1;
+            ;;
+    esac
+fi
+
+# do a quick sanity check on the image
+if [ $(stat -c "%s" "$LOCAL_PATH") -lt 10000000 ]; then
+    echo "Update file "$LOCAL_PATH" seems to be too small"
+    exit 1
+fi
+dtc -I dtb -O dtb "$LOCAL_PATH" > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Update file $LOCAL_PATH doesn't seem to be in the proper format"
+    exit 1
+fi
+
+# guess based on fw_env which partition we booted from
+BOOTADDR=$(fw_printenv bootcmd | awk '{print $2}')
+
+TGT="/dev/mtd/image-a"
+case "$BOOTADDR" in
+	20080000) TGT="/dev/mtd/image-b"; BOOTADDR="22480000" ;;
+	22480000) TGT="/dev/mtd/image-a"; BOOTADDR="20080000" ;;
+	*)        TGT="/dev/mtd/image-a"; BOOTADDR="20080000" ;;
+esac
+echo "Updating $(basename $TGT) (use bootm $BOOTADDR)"
+flash_erase $TGT 0 0
+echo "Writing $(stat -c "%s" "$LOCAL_PATH") bytes"
+cat "$LOCAL_PATH" > "$TGT"
+fw_setenv "bootcmd" "bootm ${BOOTADDR}"
+
+# reboot
+reboot
+
diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb b/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb
new file mode 100644
index 000000000..ea39e62be
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Temporary intel-fw-update script"
+DESCRIPTION = "At runtime, perform a firmware update and reboot"
+PR = "r1"
+
+# flash_eraseall
+RDEPENDS_intel-fw-update += "mtd-utils"
+# wget tftp scp
+RDEPENDS_intel-fw-update += "busybox dropbear"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRC_URI += "file://fwupd.sh"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/fwupd.sh ${D}${bindir}
+}
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
new file mode 100644
index 000000000..a7c19f708
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
@@ -0,0 +1,2 @@
+SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git"
+SRCREV = "fcce83df799d9580f48b7f793989c9c96bc882e0"
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
new file mode 100644
index 000000000..9e620a19c
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Intel IPMI Providers"
+DESCRIPTION = "IPMI Provider Libraries"
+
+SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh"
+SRCREV = "3573b25576d14b3334f93bd988c6e2003fab8f90"
+
+S = "${WORKDIR}/git"
+PV = "0.1+git${SRCPV}"
+
+DEPENDS = "boost phosphor-ipmi-host intel-ipmi-oem systemd microsoft-gsl"
+
+inherit cmake obmc-phosphor-ipmiprovider-symlink
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+
+EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1"
+
+LIBRARY_NAMES += "libmtmcmds.so"
+LIBRARY_NAMES += "libsmbioshandler.so"
+LIBRARY_NAMES += "libzbridgecmd.so"
+LIBRARY_NAMES += "libsmbiosmdrv2.so"
+LIBRARY_NAMES += "libfwupdcmds.so"
+
+HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
+NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
+
+FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
+FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
+
+do_configure_prepend() {
+    cp -r ${WORKDIR}/recipe-sysroot${libdir}/phosphor-ipmi-host ${S}
+    cp -r ${WORKDIR}/recipe-sysroot${includedir}/phosphor-ipmi-host ${S}
+    cp -r ${WORKDIR}/recipe-sysroot${includedir}/intel-ipmi-oem ${S}
+}
diff --git a/meta-openbmc-mods/meta-common/recipes-core/microsoft-gsl/microsoft-gsl.bb b/meta-openbmc-mods/meta-common/recipes-core/microsoft-gsl/microsoft-gsl.bb
new file mode 100644
index 000000000..8cb593bce
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/microsoft-gsl/microsoft-gsl.bb
@@ -0,0 +1,24 @@
+# Add GSL: Guideline Support Library for c++
+# https://github.com/Microsoft/GSL
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=363055e71e77071107ba2bb9a54bd9a7"
+
+SRC_URI = "git://github.com/Microsoft/GSL.git;protocol=https"
+
+# Modify these as desired
+PV = "1.0+git${SRCPV}"
+#SRCREV = "${AUTOREV}"
+SRCREV = "be43c79742dc36ee55b21c5d531a5ff301d0ef8d"
+
+S = "${WORKDIR}/git"
+
+do_install () {
+    install -d ${D}/usr/include
+    install -d ${D}/usr/include/gsl
+    for F in ${S}/include/gsl/*; do
+        install -m 0644 ${F} ${D}/usr/include/gsl
+    done
+}
+
+ALLOW_EMPTY_${PN} = "1"
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
new file mode 100644
index 000000000..95957591f
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.service
@@ -0,0 +1,15 @@
+[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
new file mode 100755
index 000000000..cde082013
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/files/nv-overlay.sh
@@ -0,0 +1,141 @@
+#!/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
new file mode 100644
index 000000000..78b0f80ca
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-overlay/nv-overlay.bb
@@ -0,0 +1,19 @@
+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/os-release/os-release.bbappend b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
new file mode 100644
index 000000000..584d3b645
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
@@ -0,0 +1,85 @@
+# WARNING!
+#
+# These modifications to os-release disable the bitbake parse
+# cache (for the os-release recipe only).  Before copying
+# and pasting into another recipe ensure it is understood
+# what that means!
+
+def irun_git(d, oeroot, git_cmd, **kwargs):
+    err = None
+    try:
+        cmd = 'git --work-tree {} --git-dir {}/.git {}'.format(oeroot, oeroot, git_cmd)
+        ret, err = bb.process.run(cmd, **kwargs)
+        if err is not None:
+            ret += err
+    except bb.process.ExecutionError as e:
+        ret = ''
+        if e.stdout is not None:
+            ret += e.stdout
+        if e.stderr is not None:
+            ret += e.stderr
+    except Exception as e:
+        ret = str(e)
+    return ret.strip('\n')
+
+def repo_status(d, f, repo, tagargs):
+    import subprocess
+
+    cmd_list = [['HEAD', 'rev-parse HEAD'],
+                ['TAG', 'describe {} --dirty --long'.format(tagargs)],
+                ['STATUS', 'status -sb']]
+
+    f.write(('\n# REPOSITORY: {} '.format(os.path.basename(repo))).ljust(80, '+') + '\n')
+    for item in cmd_list:
+        f.write('# {}: '.format(item[0]))
+        sb = irun_git(d, repo, item[1])
+        if sb:
+            sb_lines = sb.split('\n')
+            if len(sb_lines) == 1:
+                f.write(sb_lines[0])
+            else:
+                f.write('\n# ' + '\n# '.join(sb_lines))
+        f.write('\n')
+
+python() {
+    corebase = d.getVar('COREBASE', True)
+    mibase = os.path.join(corebase, 'meta-openbmc-mods')
+    obmc_vers = irun_git(d, corebase, 'describe --dirty --long')
+    meta_vers = irun_git(d, mibase, 'rev-parse HEAD')[0:7]
+    version_id = '{}-{}'.format(obmc_vers, meta_vers)
+    if version_id:
+        d.setVar('VERSION_ID', version_id)
+        versionList = version_id.split('-')
+        version = '{}-{}'.format(versionList[0], versionList[1])
+        d.setVar('VERSION', version)
+
+    build_id = irun_git(d, corebase, 'describe --abbrev=0')
+    if build_id:
+        d.setVar('BUILD_ID', build_id)
+}
+
+OS_RELEASE_FIELDS_append = " BUILD_ID"
+
+python do_compile_append () {
+    import glob
+    with open(d.expand('${B}/os-release'), 'a') as f:
+        corebase = d.getVar('COREBASE', True)
+        f.write('\n# Build Configuration Details\n')
+        repo_status(d, f, corebase, '')
+        repo_status(d, f, os.path.join(corebase, 'meta-openbmc-mods'), '--tags')
+        appends_dir = os.path.join(d.getVar('TOPDIR', True), 'workspace', 'appends')
+
+        for fn in glob.glob(os.path.join(appends_dir, '*.bbappend')):
+            with open(fn, 'r') as bb_f:
+                for line in bb_f:
+                    if line.startswith('# srctreebase: '):
+                        srctreebase = line.split(':', 1)[1].strip()
+                        repo_status(d, f, srctreebase, '--tags')
+}
+
+
+# Ensure the git commands run every time bitbake is invoked.
+BB_DONT_CACHE = "1"
+
+# Make os-release available to other recipes.
+SYSROOT_DIRS_append = " ${sysconfdir}"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/meta-openbmc-mods/meta-common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
new file mode 100644
index 000000000..87a4c8503
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
@@ -0,0 +1 @@
+RRECOMMENDS_${PN}_append = " vim cmake sdbusplus"
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
new file mode 100644
index 000000000..91eed5a82
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb
@@ -0,0 +1,24 @@
+# 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://git@github.com/Intel-BMC/provingground;protocol=ssh"
+
+DEPENDS = "boost sdbusplus cpu-log-util"
+
+PV = "0.1+git${SRCPV}"
+SRCREV = "3cc86d6c536b4c5ee7afb5447837b83ce8b3d149"
+
+S = "${WORKDIR}/git/peci_pcie"
+
+SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.PCIe.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/readline/readline/inputrc b/meta-openbmc-mods/meta-common/recipes-core/readline/readline/inputrc
new file mode 100644
index 000000000..7b84c9916
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/readline/readline/inputrc
@@ -0,0 +1,61 @@
+# /etc/inputrc - global inputrc for libreadline
+# See readline(3readline) and `info rluserman' for more information.
+
+# Be 8 bit clean.
+set input-meta on
+set output-meta on
+
+# To allow the use of 8bit-characters like the german umlauts, comment out
+# the line below. However this makes the meta key not work as a meta key,
+# which is annoying to those which don't need to type in 8-bit characters.
+
+# set convert-meta off
+
+# try to enable the application keypad when it is called.  Some systems
+# need this to enable the arrow keys.
+# set enable-keypad on
+
+# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys
+
+# do not bell on tab-completion 
+# set bell-style none 
+
+# some defaults / modifications for the emacs mode
+$if mode=emacs
+
+# allow the use of the Home/End keys
+ "\e[1~": beginning-of-line
+ "\e[4~": end-of-line
+
+# allow the use of the Delete/Insert keys
+ "\e[3~": delete-char
+# "\e[2~": quoted-insert
+
+# mappings for "page up" and "page down" to step to the beginning/end 
+# of the history
+# "\e[5~": beginning-of-history
+# "\e[6~": end-of-history
+
+# alternate mappings for "page up" and "page down" to search the history
+# "\e[5~": history-search-backward
+# "\e[6~": history-search-forward
+
+# # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
+# "\e[5C": forward-word
+# "\e[5D": backward-word
+# "\e\e[C": forward-word
+# "\e\e[D": backward-word
+
+# $if term=rxvt
+# "\e[8~": end-of-line
+# $endif
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+# "\eOH": beginning-of-line
+# "\eOF": end-of-line
+
+# for freebsd console
+# "\e[H": beginning-of-line
+# "\e[F": end-of-line
+
+$endif
diff --git a/meta-openbmc-mods/meta-common/recipes-core/readline/readline_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/readline/readline_%.bbappend
new file mode 100644
index 000000000..c63a45dd4
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/readline/readline_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://inputrc"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/rest-dbus/rest-dbus-static.bb b/meta-openbmc-mods/meta-common/recipes-core/rest-dbus/rest-dbus-static.bb
new file mode 100644
index 000000000..429d5b4b4
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/rest-dbus/rest-dbus-static.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Phosphor OpenBMC REST framework"
+DESCRIPTION = "Phosphor OpenBMC REST to DBUS daemon."
+HOMEPAGE = "http://github.com/openbmc/rest-dbus"
+PR = "r1"
+
+inherit allarch
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRC_URI += "git://github.com/openbmc/rest-dbus.git"
+
+SRCREV = "9273a302e8f2b3c3e939dff77758e90f163bf6a1"
+
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${datadir}/www/rest-dbus/*"
+
+do_install () {
+      install -d ${D}${datadir}/www/rest-dbus/res
+      install -m 644 ${S}/resources/** ${D}${datadir}/www/rest-dbus/res
+      install -m 644 ${S}/resources/index.html  ${D}${datadir}/www/rest-dbus/index.html
+}
+
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
new file mode 100644
index 000000000..3fe1c3f38
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/obmc-targets.bbappend
@@ -0,0 +1,9 @@
+# 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-reboot@.target"
+SYSTEMD_SERVICE_${PN}_remove += " obmc-host-startmin@.target"
+SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweron@.target"
+SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweroff@.target"
+SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-hard-poweroff@.target"
+SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-powerreset@.target"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/000-ro-rootfs-tmpfile-defaults.patch b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/000-ro-rootfs-tmpfile-defaults.patch
new file mode 100644
index 000000000..d16f3a2dc
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/000-ro-rootfs-tmpfile-defaults.patch
@@ -0,0 +1,51 @@
+From 05e1b853abfd54d117dad25185c602d1791d83f6 Mon Sep 17 00:00:00 2001
+From: David Cobbley <david.j.cobbley@linux.intel.com>
+Date: Tue, 26 Jun 2018 16:10:14 -0700
+Subject: [PATCH] ro-rootfs-tmpfile-defaults
+
+---
+ tmpfiles.d/home.conf   | 1 -
+ tmpfiles.d/tmp.conf    | 1 -
+ tmpfiles.d/var.conf.m4 | 5 ++++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/tmpfiles.d/home.conf b/tmpfiles.d/home.conf
+index 9f25b83..5c7513a 100644
+--- a/tmpfiles.d/home.conf
++++ b/tmpfiles.d/home.conf
+@@ -8,4 +8,3 @@
+ # See tmpfiles.d(5) for details
+ 
+ Q /home 0755 - - -
+-q /srv 0755 - - -
+diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
+index 22555a0..aad1b98 100644
+--- a/tmpfiles.d/tmp.conf
++++ b/tmpfiles.d/tmp.conf
+@@ -9,7 +9,6 @@
+ 
+ # Clear tmp directories separately, to make them easier to override
+ q /tmp 1777 root root 10d
+-q /var/tmp 1777 root root 30d
+ 
+ # Exclude namespace mountpoints created with PrivateTmp=yes
+ x /tmp/systemd-private-%b-*
+diff --git a/tmpfiles.d/var.conf.m4 b/tmpfiles.d/var.conf.m4
+index 0e2c509..fa288b8 100644
+--- a/tmpfiles.d/var.conf.m4
++++ b/tmpfiles.d/var.conf.m4
+@@ -11,7 +11,10 @@ q /var 0755 - - -
+ 
+ L /var/run - - - - ../run
+ 
+-d /var/log 0755 - - -
++# now /var/log and /var/tmp really live in volatile
++L /var/log - - - - volatile/log
++L /var/tmp - - - - volatile/tmp
++
+ m4_ifdef(`ENABLE_UTMP',
+ f /var/log/wtmp 0664 root utmp -
+ f /var/log/btmp 0660 root utmp -
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch
new file mode 100644
index 000000000..f72052e0c
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch
@@ -0,0 +1,28 @@
+From 3016898f4300fdd8db74f821cd6ea54dbf39fdc8 Mon Sep 17 00:00:00 2001
+From: James Feist <james.feist@linux.intel.com>
+Date: Tue, 6 Mar 2018 16:06:33 -0800
+Subject: [PATCH 1/1] Modfiy system.conf DefaultTimeoutStopSec
+
+Current time is 5 minutes, change it to 10 seconds.
+
+Signed-off-by: James Feist <james.feist@linux.intel.com>
+---
+ src/core/system.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/system.conf.in b/src/core/system.conf.in
+index 746572b..ba2a265 100644
+--- a/src/core/system.conf.in
++++ b/src/core/system.conf.in
+@@ -33,7 +33,7 @@
+ #DefaultStandardOutput=journal
+ #DefaultStandardError=inherit
+ #DefaultTimeoutStartSec=90s
+-#DefaultTimeoutStopSec=90s
++DefaultTimeoutStopSec=10s
+ #DefaultRestartSec=100ms
+ #DefaultStartLimitIntervalSec=10s
+ #DefaultStartLimitBurst=5
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 000000000..ef7ac20e2
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,11 @@
+# add some configuration overrides for systemd default /usr/lib/tmpfiles.d/
+
+LICENSE = "GPL-2.0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://000-ro-rootfs-tmpfile-defaults.patch \
+            file://0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch \
+           "
+
+USERADD_PACKAGES_remove = "${PN}-journal-gateway ${PN}-journal-upload ${PN}-journal-remote"