diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-08-30 11:32:09 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-09 11:53:36 +0100 |
| commit | e292f77d54d6a5fb412e89800dd9196fc9342a85 (patch) | |
| tree | b8755eabe618f40f11e2dbef5bf42fbc1ec6a5eb /meta/recipes-graphics | |
| parent | 3b7cdffebd12da9646f43573d989c9a76476241f (diff) | |
| download | openembedded-core-contrib-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.in | 12 | ||||
| -rw-r--r-- | meta/recipes-graphics/x11-common/x11-common_0.1.bb | 10 |
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 @@ -#!/bin/sh -# - -XSERVER=/usr/bin/Xorg - -. /etc/profile - -ARGS=" -br -pn @BLANK_ARGS@" - -DISPLAY=':0' - -exec 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 REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "file://etc \ - file://Xserver.in \ file://gplv2-license.patch" S = "${WORKDIR}" -PACKAGECONFIG ??= "blank" -# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG -PACKAGECONFIG[blank] = "" - do_install() { cp -R ${S}/etc ${D}${sysconfdir} - sed -e 's/@BLANK_ARGS@/${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}/' \ - ${S}/Xserver.in > ${D}${sysconfdir}/X11/Xserver - chmod -R 755 ${D}${sysconfdir} } -RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator xinit formfactor" +RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor" |