summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-01-16 13:36:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:14:12 +0000
commit7298317e3626454301bcb74c3e7e87fc12fd7cea (patch)
tree85013a1ba24e58e22784c733654cd1b2580767b9
parent42b7055812366674b2d5c87539f643d073246996 (diff)
downloadpoky-7298317e3626454301bcb74c3e7e87fc12fd7cea.tar.gz
xserver-xorg: Always disable systemd-logind.
Without a dm to handle the session management systemd-logind can make it difficult for X to gain ownership of devices and behave properly. Since X seems to work without enabling systemd-logind, always disable it for now, and we can revisit it if we ever want to try to take advantage of multi-user sessions/seats. [Yocto # 7100] (From OE-Core rev: 31c701821e2770e29955d1e1eb45a254f5a0acb8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 5b47e3445f..61542955a9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -114,10 +114,10 @@ EXTRA_OECONF += "--with-fop=no \
114 --with-xkb-output=/var/lib/xkb \ 114 --with-xkb-output=/var/lib/xkb \
115 --with-sha1=libcrypto \ 115 --with-sha1=libcrypto \
116 ac_cv_file__usr_share_sgml_X11_defs_ent=no \ 116 ac_cv_file__usr_share_sgml_X11_defs_ent=no \
117 --disable-systemd-logind \
117" 118"
118 119
119PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)} \ 120PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}"
120 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
121 121
122PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 122PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
123PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" 123PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto"
@@ -128,7 +128,6 @@ PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtua
128PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" 128PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
129PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" 129PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
130PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 130PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
131PACKAGECONFIG[systemd] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,dbus-lib"
132 131
133do_install_append () { 132do_install_append () {
134 # Its assumed base-files creates this for us 133 # Its assumed base-files creates this for us