diff options
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/x11-common/x11-common/Xserver.in (renamed from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/x11-common/x11-common_0.1.bb | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/meta/recipes-graphics/x11-common/x11-common/Xserver.in index 73570dfeb5..b8eed7610f 100644 --- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +++ b/meta/recipes-graphics/x11-common/x11-common/Xserver.in | |||
@@ -5,7 +5,7 @@ XSERVER=/usr/bin/Xorg | |||
5 | 5 | ||
6 | . /etc/profile | 6 | . /etc/profile |
7 | 7 | ||
8 | ARGS=" -br -pn" | 8 | ARGS=" -br -pn @BLANK_ARGS@" |
9 | 9 | ||
10 | DISPLAY=':0' | 10 | DISPLAY=':0' |
11 | 11 | ||
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 156b329486..6d7c347c00 100644 --- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb | |||
@@ -9,14 +9,21 @@ inherit distro_features_check | |||
9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
10 | 10 | ||
11 | SRC_URI = "file://etc \ | 11 | SRC_URI = "file://etc \ |
12 | file://Xserver.in \ | ||
12 | file://gplv2-license.patch" | 13 | file://gplv2-license.patch" |
13 | 14 | ||
14 | S = "${WORKDIR}" | 15 | S = "${WORKDIR}" |
15 | 16 | ||
17 | PACKAGECONFIG ??= "blank" | ||
18 | # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG | ||
19 | PACKAGECONFIG[blank] = "" | ||
20 | |||
16 | do_install() { | 21 | do_install() { |
17 | cp -R ${S}/etc ${D}${sysconfdir} | 22 | cp -R ${S}/etc ${D}${sysconfdir} |
23 | sed -e 's/@BLANK_ARGS@/${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}/' \ | ||
24 | ${S}/Xserver.in > ${D}${sysconfdir}/X11/Xserver | ||
25 | |||
18 | chmod -R 755 ${D}${sysconfdir} | 26 | chmod -R 755 ${D}${sysconfdir} |
19 | find ${D}${sysconfdir} -type f -name \*~ -exec rm -rf {} \; | ||
20 | } | 27 | } |
21 | 28 | ||
22 | RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" | 29 | RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" |