diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2017-12-17 19:21:40 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-12-30 12:32:08 -0800 |
commit | e4be8f4e9e449475644179a8c7b0d4c6c4e5cb16 (patch) | |
tree | b8ee0181ed46c6ae830dd0b0a6028e70918460e4 /meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | |
parent | 9c6309582611519c92ec11cbda5769e0f0f0c315 (diff) | |
download | meta-openembedded-e4be8f4e9e449475644179a8c7b0d4c6c4e5cb16.tar.gz |
plymouth: fix path to systemd-tty-ask-password-agent
In pre recipe specific sysroot times AC_PATH_PROG detected host's
systemd-tty-ask-password-agent. In my case that path was wrong and
systemd-ask-password-plymouth.service failed silently.
Now with recipe specific sysroot and no link in PATH to buildhost,
SYSTEMD_ASK_PASSWORD_AGENT remains empty and that causes:
| systemd[1]: /lib/systemd/system/systemd-ask-password-plymouth.service:12: Executable path is not absolute, ignoring: --watch --plymouth
| systemd[1]: systemd-ask-password-plymouth.service: Service lacks both ExecStart= and ExecStop= setting. Refusing.
For both environments this patch fixes log-off from X-session to
display-manager. Before this patch screen went dark and it seemed that X-server
was restarted.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb')
-rw-r--r-- | meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb index 6163cff7c..600c4e292 100644 --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | |||
@@ -16,13 +16,16 @@ DEPENDS = "libcap libpng cairo dbus udev" | |||
16 | PROVIDES = "virtual/psplash" | 16 | PROVIDES = "virtual/psplash" |
17 | RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" | 17 | RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" |
18 | 18 | ||
19 | SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2" | 19 | SRC_URI = " \ |
20 | http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2 \ | ||
21 | file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ | ||
22 | " | ||
20 | SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" | 23 | SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" |
21 | SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" | 24 | SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" |
22 | 25 | ||
23 | EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ | 26 | EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ |
24 | --with-logo=${LOGO} \ | 27 | --with-logo=${LOGO} \ |
25 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install', '', d)} \ | 28 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '', d)} \ |
26 | " | 29 | " |
27 | 30 | ||
28 | PACKAGECONFIG ??= "pango initrd" | 31 | PACKAGECONFIG ??= "pango initrd" |