[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2338/8267] x11-common: Remove Xserver script
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 2338/8267] x11-common: Remove Xserver script
- Date: Sat, 16 Dec 2017 23:05:25 +0000 (UTC)
commit e292f77d54d6a5fb412e89800dd9196fc9342a85
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date: Tue Aug 30 11:32:09 2016 +0300
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>
.../x11-common/x11-common/Xserver.in | 12 ------------
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_0.1.bb
b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 2bc0d33..ab9a939 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]