diff options
| author | Edward A. James <eajames@us.ibm.com> | 2016-10-15 00:07:14 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-10-21 05:40:39 +0300 |
| commit | 3d6db405fb2e77d620588533ff985a37cbca1faa (patch) | |
| tree | f8286c1bc6bf66f57096289ee6f91b9650230713 /meta-phosphor/common/recipes-core | |
| parent | d64485f2aaefcbf511d2c94f1bc63d078f2bedac (diff) | |
| download | openbmc-3d6db405fb2e77d620588533ff985a37cbca1faa.tar.xz | |
systemd: add patch for PAM enable
the pam_systemd library wasn't compiling due to logind dependencies and
shared library issues.
resolves openbmc/openbmc#619
Change-Id: I2e152c6e989025d28051008ebd032d8e696cfe68
Signed-off-by: Edward A. James <eajames@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.patch | 101 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend | 1 |
2 files changed, 102 insertions, 0 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 new file mode 100644 index 000000000..8746b723a --- /dev/null +++ b/meta-phosphor/common/recipes-core/systemd/systemd/0002-systemd-Make-pam-compile-shared-library.patch @@ -0,0 +1,101 @@ +From f6d311978915cc1e3eba8a118716a6864309d731 Mon Sep 17 00:00:00 2001 +From: "Edward A. James" <eajames@us.ibm.com> +Date: Fri, 14 Oct 2016 15:33:40 -0500 +Subject: [PATCH] systemd: Make pam compile shared library + +- make pam independant of logind +- remove bus-util.c from libshared as it's already in libsystemd-internal + +Signed-off-by: Edward A. James <eajames@us.ibm.com> +--- + Makefile.am | 60 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 28 insertions(+), 32 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index afb6b31..6dd92e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1025,7 +1025,6 @@ libshared_la_SOURCES = \ + src/shared/import-util.h \ + src/shared/sysctl-util.c \ + src/shared/sysctl-util.h \ +- src/shared/bus-util.c \ + src/shared/bus-util.h \ + src/shared/logs-show.c \ + src/shared/logs-show.h \ +@@ -5579,37 +5578,6 @@ tests += \ + test-login-tables \ + test-login-shared + +-if HAVE_PAM +-pam_systemd_la_SOURCES = \ +- src/login/pam_systemd.sym \ +- src/login/pam_systemd.c +- +-pam_systemd_la_CFLAGS = \ +- $(AM_CFLAGS) \ +- $(PAM_CFLAGS) +- +-pam_systemd_la_LDFLAGS = \ +- $(AM_LDFLAGS) \ +- -module \ +- -export-dynamic \ +- -avoid-version \ +- -shared \ +- -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym +- +-pam_systemd_la_LIBADD = \ +- libshared.la \ +- $(PAM_LIBS) +- +-pamlib_LTLIBRARIES = \ +- pam_systemd.la +- +-dist_pamconf_DATA = \ +- src/login/systemd-user +- +-EXTRA_DIST += \ +- src/login/systemd-user.m4 +-endif +- + nodist_systemunit_DATA += \ + units/systemd-logind.service + +@@ -5666,6 +5634,34 @@ EXTRA_DIST += \ + + # ------------------------------------------------------------------------------ + if HAVE_PAM ++pam_systemd_la_SOURCES = \ ++ src/login/pam_systemd.sym \ ++ src/login/pam_systemd.c ++ ++pam_systemd_la_CFLAGS = \ ++ $(AM_CFLAGS) \ ++ $(PAM_CFLAGS) ++ ++pam_systemd_la_LDFLAGS = \ ++ $(AM_LDFLAGS) \ ++ -module \ ++ -export-dynamic \ ++ -avoid-version \ ++ -shared \ ++ -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym ++ ++pam_systemd_la_LIBADD = \ ++ libshared.la \ ++ $(PAM_LIBS) ++ ++pamlib_LTLIBRARIES = \ ++ pam_systemd.la ++ ++dist_pamconf_DATA = \ ++ src/login/systemd-user ++ ++EXTRA_DIST += \ ++ src/login/systemd-user.m4 + + systemd_user_sessions_SOURCES = \ + src/user-sessions/user-sessions.c +-- +1.9.1 + diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend index feaeaf984..a93de86cc 100644 --- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend @@ -7,6 +7,7 @@ PACKAGECONFIG_remove = "machined hibernate ldconfig binfmt backlight localed \ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += "file://default.network" SRC_URI += "file://0001-Export-message_append_cmdline.patch" +SRC_URI += "file://0002-systemd-Make-pam-compile-shared-library.patch" RRECOMMENDS_${PN} += "obmc-targets" FILES_${PN} += "${libdir}/systemd/network/default.network" |