mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
3b7cdffebd
commit
e292f77d54
@@ -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 $*
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user