diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-05-01 22:00:01 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-09 21:42:50 +0100 |
commit | 87b6197d1d2517b210273871d52c8c249c9daa51 (patch) | |
tree | d9519303aa971b3d27b422ab06da26dbe2e5ea3c /meta/recipes-qt/qt4-graphics-system | |
parent | f92f71c471c7e97e679d48edd52f07deb3d6282e (diff) | |
download | poky-87b6197d1d2517b210273871d52c8c249c9daa51.tar.gz |
qt4-graphics-system: set graphic system in profile instead of X11 session
To allow the use of Qt applications started manually to use the
configured graphics system the setting needs to be available in user
environment. This moves the setting to /etc/profile.d ensuring it is
set and available. This allow the removal of x11-common as dependency.
(From OE-Core rev: 3804784b6200f82f5d8d6f533ce5e1a36ee2aeac)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4-graphics-system')
-rw-r--r-- | meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb index bae0340faf..e816a90ea8 100644 --- a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb +++ b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb | |||
@@ -3,10 +3,9 @@ SECTION = "x11/base" | |||
3 | LICENSE = "MIT-X" | 3 | LICENSE = "MIT-X" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
5 | 5 | ||
6 | QT_GRAPHICS_SYSTEM ?= "raster" | 6 | PR = "r1" |
7 | 7 | ||
8 | # xserver-common, x11-common | 8 | QT_GRAPHICS_SYSTEM ?= "raster" |
9 | VIRTUAL-RUNTIME_xserver_common ?= "x11-common" | ||
10 | 9 | ||
11 | def _get_extra_rdepends(d): | 10 | def _get_extra_rdepends(d): |
12 | gs = d.getVar('QT_GRAPHICS_SYSTEM', True) | 11 | gs = d.getVar('QT_GRAPHICS_SYSTEM', True) |
@@ -16,12 +15,11 @@ def _get_extra_rdepends(d): | |||
16 | return "" | 15 | return "" |
17 | 16 | ||
18 | do_install () { | 17 | do_install () { |
19 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | 18 | install -d ${D}/${sysconfdir}/profile.d/ |
20 | cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem | 19 | cfg_file=${D}/${sysconfdir}/profile.d/qt-graphicssystem |
21 | echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file | 20 | echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file |
22 | chmod +x $cfg_file | ||
23 | } | 21 | } |
24 | 22 | ||
25 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}" | 23 | RDEPENDS_${PN} = "${@_get_extra_rdepends(d)}" |
26 | 24 | ||
27 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 25 | PACKAGE_ARCH = "${MACHINE_ARCH}" |