aboutsummaryrefslogtreecommitdiffstats
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-08-31 08:56:49 +0100
commit9e648061e7f09911c5e471b1d194238d048884b0 (patch)
tree847fc6ddc0dca9a44b7dd985669fa14253ee2632
parent40dce269a8c85fc3ab73049e904b92c79bac83d6 (diff)
downloadopenembedded-core-contrib-9e648061e7f09911c5e471b1d194238d048884b0.tar.gz
x11-common: Remove Xserver script
X startup is now handled in xserver-nodm-init. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
-#!/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"