Update to internal 10-22-19

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

4 files changed, 7 insertions, 112 deletions

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
deleted file mode 100644
index d16f3a2dc..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/000-ro-rootfs-tmpfile-defaults.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
index f72052e0c..5b9f17006 100644
--- 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
@@ -1,4 +1,4 @@
-From 3016898f4300fdd8db74f821cd6ea54dbf39fdc8 Mon Sep 17 00:00:00 2001
+From e02932693f92d6230b5520f431e127f7b6e2183e 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
@@ -7,22 +7,22 @@ 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 +-
+ src/core/system.conf.in | 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
+index 8112125468..f7a35a56bb 100644
 --- a/src/core/system.conf.in
 +++ b/src/core/system.conf.in
-@@ -33,7 +33,7 @@
+@@ -39,7 +39,7 @@
  #DefaultStandardOutput=journal
  #DefaultStandardError=inherit
  #DefaultTimeoutStartSec=90s
 -#DefaultTimeoutStopSec=90s
 +DefaultTimeoutStopSec=10s
+ #DefaultTimeoutAbortSec=
  #DefaultRestartSec=100ms
  #DefaultStartLimitIntervalSec=10s
- #DefaultStartLimitBurst=5
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/systemd-timesyncd.service b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/systemd-timesyncd.service
deleted file mode 100644
index 9a5fffbb3..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/systemd-timesyncd.service
+++ /dev/null
@@ -1,53 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Network Time Synchronization
-Documentation=man:systemd-timesyncd.service(8)
-ConditionCapability=CAP_SYS_TIME
-ConditionVirtualization=!container
-DefaultDependencies=no
-After=systemd-remount-fs.service systemd-sysusers.service var.mount
-Before=time-set.target sysinit.target shutdown.target
-Conflicts=shutdown.target
-Wants=time-set.target time-sync.target
-
-[Service]
-AmbientCapabilities=CAP_SYS_TIME
-CapabilityBoundingSet=CAP_SYS_TIME
-ExecStart=!!/lib/systemd/systemd-timesyncd
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-PrivateDevices=yes
-PrivateTmp=yes
-ProtectControlGroups=yes
-ProtectHome=yes
-ProtectHostname=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=strict
-Restart=always
-RestartSec=0
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-RestrictNamespaces=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-RuntimeDirectory=systemd/timesync
-StateDirectory=systemd/timesync
-SystemCallArchitectures=native
-SystemCallErrorNumber=EPERM
-SystemCallFilter=@system-service @clock
-Type=notify
-User=systemd-timesync
-WatchdogSec=3min
-
-[Install]
-WantedBy=sysinit.target
-Alias=dbus-org.freedesktop.timesync1.service
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 3e5adf7ce..d80714589 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
@@ -4,8 +4,7 @@ LICENSE = "GPL-2.0"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://000-ro-rootfs-tmpfile-defaults.patch \
-            file://0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch \
+SRC_URI += "file://0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch \
             file://systemd-time-wait-sync.service \
            "