summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-08-30 11:32:09 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 11:53:36 +0100
commite292f77d54d6a5fb412e89800dd9196fc9342a85 (patch)
treeb8755eabe618f40f11e2dbef5bf42fbc1ec6a5eb /meta/recipes-graphics
parent3b7cdffebd12da9646f43573d989c9a76476241f (diff)
downloadpoky-e292f77d54d6a5fb412e89800dd9196fc9342a85.tar.gz
x11-common: Remove Xserver script
X startup is now handled in xserver-nodm-init. (From OE-Core rev: 877851cf0f76a5052900954670fb64aed27a7a1f) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/Xserver.in12
-rw-r--r--meta/recipes-graphics/x11-common/x11-common_0.1.bb10
2 files changed, 1 insertions, 21 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common/Xserver.in b/meta/recipes-graphics/x11-common/x11-common/Xserver.in
deleted file mode 100644
index b8eed7610f..0000000000
--- a/meta/recipes-graphics/x11-common/x11-common/Xserver.in
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2#
3
4XSERVER=/usr/bin/Xorg
5
6. /etc/profile
7
8ARGS=" -br -pn @BLANK_ARGS@"
9
10DISPLAY=':0'
11
12exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 2bc0d33226..ab9a939ce0 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -9,22 +9,14 @@ inherit distro_features_check
9REQUIRED_DISTRO_FEATURES = "x11" 9REQUIRED_DISTRO_FEATURES = "x11"
10 10
11SRC_URI = "file://etc \ 11SRC_URI = "file://etc \
12 file://Xserver.in \
13 file://gplv2-license.patch" 12 file://gplv2-license.patch"
14 13
15S = "${WORKDIR}" 14S = "${WORKDIR}"
16 15
17PACKAGECONFIG ??= "blank"
18# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG
19PACKAGECONFIG[blank] = ""
20
21do_install() { 16do_install() {
22 cp -R ${S}/etc ${D}${sysconfdir} 17 cp -R ${S}/etc ${D}${sysconfdir}
23 sed -e 's/@BLANK_ARGS@/${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}/' \
24 ${S}/Xserver.in > ${D}${sysconfdir}/X11/Xserver
25
26 chmod -R 755 ${D}${sysconfdir} 18 chmod -R 755 ${D}${sysconfdir}
27} 19}
28 20
29RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator xinit formfactor" 21RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor"
30 22