qt4-x11-demo-image: Fix bug 999
cover qt4-x11-demo-image: Fix bug 999
From: Xiaofeng Yan <[email protected]>
Fix bug 999
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/qt4-x11-demo-image
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4-x11-demo-image
Thanks,
Xiaofeng Yan <[email protected]>
---
Xiaofeng Yan (1):
qt4-x11-demo-image: Fix bug 999
meta/classes/palmtop.bbclass | 26 ++ meta/classes/sdk.bbclass | 74 ++++ meta/recipes-qt/images/micro-base-image.bb | 19 + meta/recipes-qt/images/qt4-x11-base-image.bb | 35 ++ meta/recipes-qt/images/qt4-x11-demo-image.bb | 12 + meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 20 + meta/recipes-qt/qwt/files/qt2-fix.patch | 408 ++++++++++++++++++++++ meta/recipes-qt/qwt/qwt.inc | 33 ++ meta/recipes-qt/qwt/qwt_5.2.1.bb | 13 + meta/recipes-qt/tasks/task-qt4-x11.bb | 52 +++ meta/recipes-qt/tasks/task-sdk-host.bb | 21 ++ 12 files changed, 768 insertions(+), 0 deletions(-) create mode 100644 meta/classes/palmtop.bbclass create mode 100644 meta/classes/sdk.bbclass create mode 100644 meta/recipes-qt/images/micro-base-image.bb create mode 100644 meta/recipes-qt/images/qt4-x11-base-image.bb create mode 100644 meta/recipes-qt/images/qt4-x11-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.inc create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb create mode 100644 meta/recipes-qt/tasks/task-qt4-x11.bb create mode 100644 meta/recipes-qt/tasks/task-sdk-host.bb
PATCH 1/1 qt4-x11-demo-image: Fix bug 999
From: Xiaofeng Yan <[email protected]>
[YOCTO #999]
Add qt4-x11-demo-image for fixing bug 999
--- meta/classes/palmtop.bbclass | 26 ++ meta/classes/sdk.bbclass | 74 ++++ meta/recipes-qt/images/micro-base-image.bb | 19 + meta/recipes-qt/images/qt4-x11-base-image.bb | 35 ++ meta/recipes-qt/images/qt4-x11-demo-image.bb | 12 + meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 20 + meta/recipes-qt/qwt/files/qt2-fix.patch | 408 ++++++++++++++++++++++ meta/recipes-qt/qwt/qwt.inc | 33 ++ meta/recipes-qt/qwt/qwt_5.2.1.bb | 13 + meta/recipes-qt/tasks/task-qt4-x11.bb | 52 +++ meta/recipes-qt/tasks/task-sdk-host.bb | 21 ++ 12 files changed, 768 insertions(+), 0 deletions(-) create mode 100644 meta/classes/palmtop.bbclass create mode 100644 meta/classes/sdk.bbclass create mode 100644 meta/recipes-qt/images/micro-base-image.bb create mode 100644 meta/recipes-qt/images/qt4-x11-base-image.bb create mode 100644 meta/recipes-qt/images/qt4-x11-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.inc create mode 100644 meta/recipes-qt/qwt/qwt_5.2.1.bb create mode 100644 meta/recipes-qt/tasks/task-qt4-x11.bb create mode 100644 meta/recipes-qt/tasks/task-sdk-host.bb
meta/classes/palmtop.bbclass new file +26 -0
@@ -0,0 +1,26 @@ +# this build class sets up qmake variables to +# * build using the Qt Windowing System (QWS) +# * use qt +# * link against supc++ instead of stdc++ +# * use threads, if requested via PALMTOP_USE_MULTITHREADED_QT = "yes" +# inherit this class to build programs against libqpe +# inherit opie if you want to build programs against libopie2 +# don't override EXTRA_QMAKEVARS_POST, if you use inherit this class + +inherit qmake2 + +# special case for DISTRO = sharprom +CPP_SUPPORT_LIB = "LIBS-=-lstdc++ LIBS+=-lsupc++" +CPP_SUPPORT_LIB_sharprom-compatible = "LIBS+=-lstdc++" +EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}" +EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}' +EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" +DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' +EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' " + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" +FILES_${PN} += " ${palmtopdir} " +FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \ + ${palmtopdir}/bin/.debug \ + ${palmtopdir}/plugins/*/.debug "
meta/classes/sdk.bbclass new file +74 -0
74 lines not on this page · raw message
meta/recipes-qt/images/micro-base-image.bb new file +19 -0
@@ -0,0 +1,19 @@ +# micro-base-image +# +# Image configuration for the OE Micro Linux Distribuion (micro, micro-uclibc) +# + +# Install basic files only +IMAGE_INSTALL = "base-files base-passwd dropbear netbase" +IMAGE_LINGUAS = "" + +# Use busybox as login manager +IMAGE_LOGIN_MANAGER = "busybox" + +# Include minimum init and init scripts +IMAGE_DEV_MANAGER = "busybox-mdev" +IMAGE_INIT_MANAGER = "sysvinit sysvinit-pidof" +IMAGE_INITSCRIPTS = "" + +inherit image +
meta/recipes-qt/images/qt4-x11-base-image.bb new file +35 -0
@@ -0,0 +1,35 @@ +require micro-base-image.bb +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + + +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev " + +DEPENDS += "task-qt4-x11" + +RDEPENDS_${PN} += " \ + task-qt4-x11-base \ + task-qt4-x11-qwt \ + " + +IMAGE_INSTALL += "\ + initscripts \ + kernel-modules \ + gdbserver \ + strace \ + module-init-tools \ + task-qt4-x11-base \ + task-qt4-x11-qwt \ + ${TOUCH} \ + pointercal \ + ${XSERVER} \ + xauth xhost xset xrandr \ +" + + +# ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \
meta/recipes-qt/images/qt4-x11-demo-image.bb new file +12 -0
@@ -0,0 +1,12 @@ +require qt4-x11-base-image.bb +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + + +IMAGE_INSTALL += "\ + qt4-demos qt4-examples qt-demo-init \ + qt4-assistant \ + qwt-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 +20 -0
@@ -0,0 +1,20 @@ +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.inc new file +33 -0
@@ -0,0 +1,33 @@ +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}" + +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 +13 -0
@@ -0,0 +1,13 @@ +LICENSE = "LGPL" +PR = "r1" + +inherit qt4x11 + +require qwt.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" + +SRC_URI[qwt.md5sum] = "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[qwt.sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f" + +RPROVIDES_${PN}-dev = "libqwt-dev"
meta/recipes-qt/tasks/task-qt4-x11.bb new file +52 -0
52 lines not on this page · raw message
meta/recipes-qt/tasks/task-sdk-host.bb new file +21 -0
@@ -0,0 +1,21 @@ +# +# Copyright (C) 2007 OpenedHand Ltd +# + +DESCRIPTION = "Host packages for the standalone SDK or external toolchain" +PR = "r3" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +inherit sdk + +PACKAGES = "${PN}" + +RDEPENDS_${PN} = "\ + binutils-cross-sdk \ + gcc-cross-sdk \ + gdb-cross-sdk \ + pkgconfig-sdk \ + opkg-sdk \ + libtool-sdk \ + "
Signature · 1 line
1.7.0.4
Quoted 4 lines · On Monday 22 August 2011 12:34:11 Xiaofeng Yan wrote:
From: Xiaofeng Yan <[email protected]>
[YOCTO #999]
Add qt4-x11-demo-image for fixing bug 999
Thanks for looking into this bug. A couple of comments though:
1) You need to specify an appropriate commit message. This should include a reason for adding (i.e. to allow easy testing of Qt4 on X11); you also need to credit OE if that's where you copied some of the metadata from.
2) This adds quite a lot more than should be needed for a simple demo image. The image itself should inherit from core-image, this will save a lot of duplication. Why are you adding palmtop.bbclass, sdk.bbclass, task-sdk-host, micro-base-image etc.? These should not be needed at all.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 11 lines · Paul Eggleton
Quoted 4 lines · On Monday 22 August 2011 12:34:11 Xiaofeng Yan wrote:
From: Xiaofeng Yan<[email protected]>
[YOCTO #999]
Add qt4-x11-demo-image for fixing bug 999Thanks for looking into this bug. A couple of comments though:
1) You need to specify an appropriate commit message. This should include a reason for adding (i.e. to allow easy testing of Qt4 on X11); you also need to credit OE if that's where you copied some of the metadata from.
Quoted 8 lines
2) This adds quite a lot more than should be needed for a simple demo image. The image itself should inherit from core-image, this will save a lot of duplication. Why are you adding palmtop.bbclass, sdk.bbclass, task-sdk-host, micro-base-image etc.? These should not be needed at all.
Cheers,
Paul
Thanks for your comments very much. I will make a change for the method to fix bug 999 according to your suggestion.
Thanks
Yan