summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-core
diff options
context:
space:
mode:
authorSaqib Khan <khansa@us.ibm.com>2017-03-28 21:38:17 -0500
committerPatrick Williams <patrick@stwcx.xyz>2017-04-06 21:06:39 +0000
commit5e45c86989c000ed7baef9f72ad775ccba866556 (patch)
tree2b7739d2c258b9a6ffa393c450cb3923d11f4763 /meta-phosphor/common/recipes-core
parent17663502c5fbc690a1bec59db0a3b03117334d07 (diff)
downloadtalos-openbmc-5e45c86989c000ed7baef9f72ad775ccba866556.tar.gz
talos-openbmc-5e45c86989c000ed7baef9f72ad775ccba866556.zip
Modify the systemd patch to match the correct
Makefile. Note: This is part of the change required to upgrade systemd to version 232. Resolves openbmc/openbmc#932 Change-Id: Ia529e301c63938a68e1acd3eb74242c2dd92ba3d Signed-off-by: Saqib Khan <khansa@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-core')
-rw-r--r--meta-phosphor/common/recipes-core/systemd/systemd/0002-systemd-Make-pam-compile-shared-library.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0002-systemd-Make-pam-compile-shared-library.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0002-systemd-Make-pam-compile-shared-library.patch
index 8746b723a..977f56532 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd/0002-systemd-Make-pam-compile-shared-library.patch
+++ b/meta-phosphor/common/recipes-core/systemd/systemd/0002-systemd-Make-pam-compile-shared-library.patch
@@ -23,7 +23,7 @@ index afb6b31..6dd92e7 100644
src/shared/bus-util.h \
src/shared/logs-show.c \
src/shared/logs-show.h \
-@@ -5579,37 +5578,6 @@ tests += \
+@@ -5579,39 +5578,6 @@ tests += \
test-login-tables \
test-login-shared
@@ -51,8 +51,10 @@ index afb6b31..6dd92e7 100644
-pamlib_LTLIBRARIES = \
- pam_systemd.la
-
+-if ENABLE_PAM_CONFIG
-dist_pamconf_DATA = \
- src/login/systemd-user
+-endif
-
-EXTRA_DIST += \
- src/login/systemd-user.m4
OpenPOWER on IntegriCloud