| Submitter | Otavio Salvador |
|---|---|
| Date | May 2, 2012, 1 a.m. |
| Message ID | <1335920401-23586-1-git-send-email-otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/26787/ |
| State | Accepted |
| Commit | 3804784b6200f82f5d8d6f533ce5e1a36ee2aeac |
| Headers | show |
Comments
On 05/01/2012 06:00 PM, Otavio Salvador wrote: > 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. > > Signed-off-by: Otavio Salvador<otavio@ossystems.com.br> > --- > .../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 bae0340..e816a90 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" > LICENSE = "MIT-X" > LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > > -QT_GRAPHICS_SYSTEM ?= "raster" > +PR = "r1" > > -# xserver-common, x11-common > -VIRTUAL-RUNTIME_xserver_common ?= "x11-common" > +QT_GRAPHICS_SYSTEM ?= "raster" > > def _get_extra_rdepends(d): > gs = d.getVar('QT_GRAPHICS_SYSTEM', True) > @@ -16,12 +15,11 @@ def _get_extra_rdepends(d): > return "" > > do_install () { > - install -d ${D}/${sysconfdir}/X11/Xsession.d/ > - cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem > + install -d ${D}/${sysconfdir}/profile.d/ > + cfg_file=${D}/${sysconfdir}/profile.d/qt-graphicssystem > echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}"> $cfg_file > - chmod +x $cfg_file > } > > -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}" > +RDEPENDS_${PN} = "${@_get_extra_rdepends(d)}" > > PACKAGE_ARCH = "${MACHINE_ARCH}" Merged into OE-Core Thanks Sau!
Patch
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 bae0340..e816a90 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" LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -QT_GRAPHICS_SYSTEM ?= "raster" +PR = "r1" -# xserver-common, x11-common -VIRTUAL-RUNTIME_xserver_common ?= "x11-common" +QT_GRAPHICS_SYSTEM ?= "raster" def _get_extra_rdepends(d): gs = d.getVar('QT_GRAPHICS_SYSTEM', True) @@ -16,12 +15,11 @@ def _get_extra_rdepends(d): return "" do_install () { - install -d ${D}/${sysconfdir}/X11/Xsession.d/ - cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem + install -d ${D}/${sysconfdir}/profile.d/ + cfg_file=${D}/${sysconfdir}/profile.d/qt-graphicssystem echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file - chmod +x $cfg_file } -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}" +RDEPENDS_${PN} = "${@_get_extra_rdepends(d)}" PACKAGE_ARCH = "${MACHINE_ARCH}"
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. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- .../qt4-graphics-system/qt4-graphics-system_1.0.bb | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)