mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 18:49:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

x11-common: Remove Xserver script

Browse Source 
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>
This commit is contained in:
Jussi Kukkonen
2016-08-30 11:32:09 +03:00
committed by Richard Purdie
parent 3b7cdffebd
commit e292f77d54
2 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/recipes-graphics/x11-common/x11-common/Xserver.in
View File

@@ -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 $*

10
meta/recipes-graphics/x11-common/x11-common_0.1.bb
View File

@@ -9,22 +9,14 @@ inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "file://etc \ SRC_URI = "file://etc \
file://Xserver.in \
file://gplv2-license.patch" file://gplv2-license.patch"
S = "${WORKDIR}" S = "${WORKDIR}"
PACKAGECONFIG ??= "blank"
# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG
PACKAGECONFIG[blank] = ""
do_install() { do_install() {
cp -R ${S}/etc ${D}${sysconfdir} 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} chmod -R 755 ${D}${sysconfdir}
} }
RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator xinit formfactor" RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor"