qt4e-demo-image: Fix bug 999
cover qt4e-demo-image: Fix bug 999
From: Xiaofeng Yan <[email protected]>
Copy metadata of qt4e-demo-image from OE for easy testing qt4e on yocto project.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/qt4-demo-image
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4-demo-image
Thanks,
Xiaofeng Yan <[email protected]>
---
Xiaofeng Yan (1):
qt4e-demo-image: Fix bug 999
meta/recipes-qt/images/qt4e-base-image.bb | 19 + meta/recipes-qt/images/qt4e-demo-image.bb | 11 + meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 + meta/recipes-qt/qwt/files/qt2-fix.patch | 408 ++++++++++++++++++++++ meta/recipes-qt/qwt/qwt-e_5.2.1.bb | 11 + meta/recipes-qt/qwt/qwt.inc | 36 ++ meta/recipes-qt/qwt/qwt_5.2.1.bb | 10 + meta/recipes-qt/tasks/task-qt4e.bb | 54 +++ 9 files changed, 623 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb create mode 100644 meta/recipes-qt/qwt/files/qt2-fix.patch create mode 100644 meta/recipes-qt/qwt/qwt-e_5.2.1.bb create mode 100644 meta/recipes-qt/qwt/qwt.inc create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb
PATCH 1/1 qt4e-demo-image: Fix bug 999
From: Xiaofeng Yan <[email protected]>
[YOCTO #999]
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform. This image was tested on qemuarm and can run program "qtdemoE".
--- meta/recipes-qt/images/qt4e-base-image.bb | 19 + meta/recipes-qt/images/qt4e-demo-image.bb | 11 + meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 + meta/recipes-qt/qwt/files/qt2-fix.patch | 408 ++++++++++++++++++++++ meta/recipes-qt/qwt/qwt-e_5.2.1.bb | 11 + meta/recipes-qt/qwt/qwt.inc | 36 ++ meta/recipes-qt/qwt/qwt_5.2.1.bb | 10 + meta/recipes-qt/tasks/task-qt4e.bb | 54 +++ 9 files changed, 623 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb create mode 100644 meta/recipes-qt/qwt/files/qt2-fix.patch create mode 100644 meta/recipes-qt/qwt/qwt-e_5.2.1.bb create mode 100644 meta/recipes-qt/qwt/qwt.inc create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb
meta/recipes-qt/images/qt4e-base-image.bb new file +19 -0
@@ -0,0 +1,19 @@ +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' + +DEPENDS += "task-qt4e" + +RDEPENDS_${PN} += " \ + task-qt4e-base \ + task-qt4e-qwt \ + " + +IMAGE_INSTALL += "\ + initscripts \ + kernel-modules \ + gdbserver \ + strace \ + module-init-tools \ + task-qt4e-base \ + task-qt4e-qwt \ + ${TOUCH} \ +"
meta/recipes-qt/images/qt4e-demo-image.bb new file +11 -0
@@ -0,0 +1,11 @@ +require qt4e-base-image.bb + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + + +IMAGE_INSTALL += "\ + qt4-embedded-demos qt4-embedded-examples qt-demo-init \ + qt4-embedded-assistant \ + qwt-e-examples \ +"
meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init new file +55 -0
55 lines not on this page · raw message
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb new file +19 -0
@@ -0,0 +1,19 @@ +DESCRIPTION = "Init script for qtdemo" +LICENSE = "MIT" +SRC_URI = "file://qtdemo-init" +PR = "r2" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + + +PACKAGE_ARCH = "all" + +do_install() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo +} + +inherit update-rc.d + +INITSCRIPT_NAME = "qtdemo" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ."
meta/recipes-qt/qwt/files/qt2-fix.patch new file +408 -0
408 lines not on this page · raw message
meta/recipes-qt/qwt/qwt-e_5.2.1.bb new file +11 -0
@@ -0,0 +1,11 @@ +inherit qt4e + +require qwt.inc +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + + +SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f" + +RPROVIDES_${PN}-dev = "libqwt-dev"
meta/recipes-qt/qwt/qwt.inc new file +36 -0
@@ -0,0 +1,36 @@ +DESCRIPTION = "Qt Widget Extension for Technical Applications" +SECTION = "libs" +PRIORITY = "optional" + +# LGPLv2.1 + some exceptions +LICENSE = "QWTv1.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt" + +S = "${WORKDIR}/qwt-${PV}" +#OE_CFLAGS += "-lX11" +CFLAGS += "-lx11 -lX11" + +CXXFLAGS += "-lX11 -lx11" +do_configure_prepend() { + sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX} :' *.pri + sed -i -e s:lqwt:lqwt${QT_LIBINFIX}:g -e s:/usr/local/qwt-$\${QwtVersion}:${prefix}:g *.prf + sed -e 's/#CONFIG += QwtExamples/CONFIG += QwtExamples/g' -i qwtconfig.pri + sed -i -e s:/usr/local/qwt-${PV}:${D}${prefix}:g ${S}/*.pri +} + +do_install() { + oe_runmake -e install + install -d ${D}${datadir}/doc/${PN} + mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ + cd ${S}/examples + install -d ${D}/${bindir} + cd ${S}/examples/bin${QT_LIBINFIX}/ + for i in * ; do + cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX} + done +} + +PACKAGES_prepend = "${PN}-examples " +FILES_${PN}-examples = "${bindir}/*" +
meta/recipes-qt/qwt/qwt_5.2.1.bb new file +10 -0
@@ -0,0 +1,10 @@ +inherit qt4x11 + +require qwt.inc +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f" + +RPROVIDES_${PN}-dev = "libqwt-dev"
meta/recipes-qt/tasks/task-qt4e.bb new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
1.7.0.4
Quoted 7 lines · On Tuesday 23 August 2011 11:57:35 Xiaofeng Yan wrote:
From: Xiaofeng Yan <[email protected]>
[YOCTO #999]
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform. This image was tested on qemuarm and can run program "qtdemoE".
I don't think we should pull in qwt in OE-core (or at least, we shouldn't drag it in just for this.) Also I would recommend trying to make the image inherit from core-image as well to avoid much of the generic boilerplate that's in there.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Op 23 aug. 2011, om 14:18 heeft Paul Eggleton het volgende geschreven:
Quoted 5 lines · On Tuesday 23 August 2011 11:57:35 Xiaofeng Yan wrote:
Quoted 4 lines
From: Xiaofeng Yan <[email protected]>
[YOCTO #999]
Quoted 8 lines
Quoted 3 lines
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform. This image was tested on qemuarm and can run program "qtdemoE".
I don't think we should pull in qwt in OE-core (or at least, we shouldn't drag it in just for this.) Also I would recommend trying to make the image inherit from core-image as well to avoid much of the generic boilerplate that's in there.
I would lean toward a seperate meta-qt layer, not sure if it should be hosted in the oe-core git repo, meta-oe or a completely seperate git repo.
regards,
Koen
Quoted 2 lines · On Tuesday 23 August 2011 13:27:11 you wrote:
I would lean toward a seperate meta-qt layer, not sure if it should be hosted in the oe-core git repo, meta-oe or a completely seperate git repo.
Possibly we should have meta-qt for Qt applications and additional libraries such as Qwt (and I'm all for moving our current Qt apps there, they don't really belong in OE-core IMHO). If you're suggesting moving out Qt itself though, I think Qt belongs in OE-core, certainly as much as GTK+ does.
The purpose of having these images was to have a simple way to test that Qt has built correctly and is functional. If Qt is in OE-core I don't think that's unreasonable.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Op 23 aug. 2011, om 14:53 heeft Paul Eggleton het volgende geschreven:
Quoted 8 lines · On Tuesday 23 August 2011 13:27:11 you wrote:
Quoted 2 lines
I would lean toward a seperate meta-qt layer, not sure if it should be hosted in the oe-core git repo, meta-oe or a completely seperate git repo.
Possibly we should have meta-qt for Qt applications and additional libraries such as Qwt (and I'm all for moving our current Qt apps there, they don't really belong in OE-core IMHO). If you're suggesting moving out Qt itself though, I think Qt belongs in OE-core, certainly as much as GTK+ does.
I still say that gtk+ should be in it's own layer as well :) I hope to have some time in september to come up with a proposal to rearrange oe-core and meta-oe in a more logical set of layers.
Quoted 7 lines · Koen Kooi
Op 23 aug. 2011, om 14:53 heeft Paul Eggleton het volgende geschreven:
Quoted 4 lines · On Tuesday 23 August 2011 13:27:11 you wrote:
Quoted 2 lines
I would lean toward a seperate meta-qt layer, not sure if it should be hosted in the oe-core git repo, meta-oe or a completely seperate git repo.
Quoted 6 lines
Quoted 4 lines
Possibly we should have meta-qt for Qt applications and additional libraries such as Qwt (and I'm all for moving our current Qt apps there, they don't really belong in OE-core IMHO). If you're suggesting moving out Qt itself though, I think Qt belongs in OE-core, certainly as much as GTK+ does.
I still say that gtk+ should be in it's own layer as well :) I hope to have some time in september to come up with a proposal to rearrange oe-core and meta-oe in a more logical set of layers.
Yea, we should discuss this further (post 1.1) for me, while I think it's important to have some demos/test with the oe-core (if we keep it in oe-core), I am not sure we should have all the tests there.
I would suggest possibly renaming the current meta-qt3 to meta-qt and including this set of demos there.
Comments?
Sau!
We already have a QT3 layer, maybe it makes sense to make that a generic meta-qt layer and have things reside in it.
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 2 lines · On Wednesday 24 August 2011 01:16:30 you wrote:
I would suggest possibly renaming the current meta-qt3 to meta-qt and including this set of demos there.
We really don't want to mix Qt 3 and Qt 4; we really only have a layer for Qt 3 for LSB, I doubt anyone will actually use it.
By the way, in case there is some confusion, these are not extra demos. The demo images should merely bring in packages we are already building as part of Qt 4, nothing more.
IMHO, these images either belong together with Qt 4 (whereever that might be) or in a separate tests layer that contains testing items for everything in OE- core. However, now isn't really the time to be making those reorganisations; so either we drop this task for this cycle or we add them to OE-core, that's the decision that needs to be made.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre