add qt4-x11-base and demo images
PATCH 1/2 add qt4-x11-base and demo images
these are images integrating qt4-x11-free librarie and its demo applications running using Xorg.
--- recipes/images/qt4-x11-base-image.bb | 59 ++++++++++++++++++++++++++++++++++ recipes/images/qt4-x11-demo-image.bb | 7 ++++ 2 files changed, 66 insertions(+), 0 deletions(-) create mode 100644 recipes/images/qt4-x11-base-image.bb create mode 100644 recipes/images/qt4-x11-demo-image.bb
recipes/images/qt4-x11-base-image.bb new file +59 -0
@@ -0,0 +1,59 @@ +require micro-base-image.bb + +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev " + +RDEPENDS_append += " \ + qt4-x11-free \ + " + +QT_INSTALL = " \ + libqt3support4 \ + libqtclucene4 \ + libqtcore4 \ + libqtdbus4 \ + libqtgui4 \ + libqthelp4 \ + libqtmultimedia4 \ + libqtnetwork4 \ + libqtscript4 \ + libqtscripttools4 \ + libqtsql4 \ + libqtsvg4 \ + libqttest4 \ + libqtwebkit4 \ + libqtxml4 \ + libqtxmlpatterns4 \ + qt4-fonts \ + qt4-plugin-iconengine-svgicon \ + qt4-plugin-imageformat-gif \ + qt4-plugin-imageformat-ico \ + qt4-plugin-imageformat-jpeg \ + qt4-plugin-imageformat-mng \ + qt4-plugin-imageformat-svg \ + qt4-plugin-imageformat-tiff \ + qt4-plugin-phonon-backend-gstreamer \ + qt4-plugin-script-dbus \ + qt4-plugin-sqldriver-sqlite2 \ + qt4-plugin-sqldriver-sqlite \ +" + +IMAGE_INSTALL += "\ + initscripts \ + kernel-modules \ + gdbserver \ + strace \ + module-init-tools \ + ${QT_INSTALL} \ + ${TOUCH} \ + qwt \ + pointercal \ + ${XSERVER} \ + ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ + xauth xhost xset xrandr \ +" +
recipes/images/qt4-x11-demo-image.bb new file +7 -0
@@ -0,0 +1,7 @@ +require qt4-x11-base-image.bb + +IMAGE_INSTALL += "\ + qt4-demos qt4-examples qt-demo-init \ + qt4-assistant \ + qwt-examples \ +"
Signature · 1 line
1.6.3.3
PATCH 2/2 qt-demo-init: correctly handle qtdemo for qt4-x11
--- recipes/qt4/qt-demo-init/qtdemo-init | 21 ++++++++++++++++++--- recipes/qt4/qt-demo-init_0.1.bb | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-)
recipes/qt4/qt-demo-init/qtdemo-init +18 -3
@@ -3,7 +3,7 @@ set -e if [ -f /usr/bin/qtdemo ]; then - QTDEMO=qtdemo + QTDEMO="qtdemo > /var/log/Xsession.log 2>&1" else QTDEMO="qtdemoE -qws" fi
@@ -18,14 +18,29 @@ case "$1" in if [ ! -f /etc/pointercal ]; then /usr/bin/ts_calibrate fi - QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & + if [ $QTDEMO == qtdemo ]; then + Xorg & + export DISPLAY=:0 + $QTDEMO & + else + QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & + fi else + if [ $QTDEMO == qtdemo ]; then + Xorg & + export DISPLAY=:0 + fi $QTDEMO & fi ;; stop) echo "Stopping qtdemo" - killall qtdemoE + if [ $QTDEMO == qtdemo ]; then + killall Xorg + killall qtdemo + else + killall qtdemoE + fi ;; restart) $0 stop
recipes/qt4/qt-demo-init_0.1.bb +1 -1
@@ -1,7 +1,7 @@ DESCRIPTION = "Init script for qtdemo" LICENSE = "MIT" SRC_URI = "file://qtdemo-init" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all"
Signature · 1 line
1.6.3.3
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Could you please put those in a task so they can be reused in other images?
Quoted 82 lines · Eric Bénard
these are images integrating qt4-x11-free librarie and its demo applications running using Xorg.
Signed-off-by Eric Bénard <[email protected]>--- recipes/images/qt4-x11-base-image.bb | 59 ++++++++++++++++++++++++++++++++++ recipes/images/qt4-x11-demo-image.bb | 7 ++++ 2 files changed, 66 insertions(+), 0 deletions(-) create mode 100644 recipes/images/qt4-x11-base-image.bb create mode 100644 recipes/images/qt4-x11-demo-image.bbrecipes/images/qt4-x11-base-image.bb new file +59
-0@@ -0,0 +1,59 @@ +require micro-base-image.bb + +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev " + +RDEPENDS_append += " \ + qt4-x11-free \ + " + +QT_INSTALL = " \ + libqt3support4 \ + libqtclucene4 \ + libqtcore4 \ + libqtdbus4 \ + libqtgui4 \ + libqthelp4 \ + libqtmultimedia4 \ + libqtnetwork4 \ + libqtscript4 \ + libqtscripttools4 \ + libqtsql4 \ + libqtsvg4 \ + libqttest4 \ + libqtwebkit4 \ + libqtxml4 \ + libqtxmlpatterns4 \ + qt4-fonts \ + qt4-plugin-iconengine-svgicon \ + qt4-plugin-imageformat-gif \ + qt4-plugin-imageformat-ico \ + qt4-plugin-imageformat-jpeg \ + qt4-plugin-imageformat-mng \ + qt4-plugin-imageformat-svg \ + qt4-plugin-imageformat-tiff \ + qt4-plugin-phonon-backend-gstreamer \ + qt4-plugin-script-dbus \ + qt4-plugin-sqldriver-sqlite2 \ + qt4-plugin-sqldriver-sqlite \ +" + +IMAGE_INSTALL += "\ + initscripts \ + kernel-modules \ + gdbserver \ + strace \ + module-init-tools \ + ${QT_INSTALL} \ + ${TOUCH} \ + qwt \ + pointercal \ + ${XSERVER} \ + ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ + xauth xhost xset xrandr \ +" +recipes/images/qt4-x11-demo-image.bb new file +0
-0
recipes/images/qt4-x11-demo-image.bb line 7
Quoted 7 lines
recipes/images/qt4-x11-demo-image.bb new file +7
-0@@ -0,0 +1,7 @@ +require qt4-x11-base-image.bb + +IMAGE_INSTALL += "\ + qt4-demos qt4-examples qt-demo-init \ + qt4-assistant \ + qwt-examples \ +"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFM75fBMkyGM64RGpERAtC8AJsGzlOp2CYEyO/RnjX1iOShBpD2OACgiILB 4HT1IOg9RJeJzsxa7tvfRYY=
=AvOj
-----END PGP SIGNATURE-----
PATCH 1/1 add task-qt4-x11 and qt4-x11 base & demo images
these are images integrating qt4-x11-free librarie and its demo applications running using Xorg.
--- recipes/images/qt4-x11-base-image.bb | 30 ++++++++++++++++++++++ recipes/images/qt4-x11-demo-image.bb | 7 +++++ recipes/tasks/task-qt4-x11.bb | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 0 deletions(-) create mode 100644 recipes/images/qt4-x11-base-image.bb create mode 100644 recipes/images/qt4-x11-demo-image.bb create mode 100644 recipes/tasks/task-qt4-x11.bb
recipes/images/qt4-x11-base-image.bb new file +30 -0
@@ -0,0 +1,30 @@ +require micro-base-image.bb + +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} \ + ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ + xauth xhost xset xrandr \ +"
recipes/images/qt4-x11-demo-image.bb new file +7 -0
@@ -0,0 +1,7 @@ +require qt4-x11-base-image.bb + +IMAGE_INSTALL += "\ + qt4-demos qt4-examples qt-demo-init \ + qt4-assistant \ + qwt-examples \ +"
recipes/tasks/task-qt4-x11.bb new file +46 -0
47 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Re: [PATCH] add task-qt4-x11 and qt4-x11 base & demo images
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 4 lines · Eric Bénard
these are images integrating qt4-x11-free librarie and its demo applications running using Xorg.
Signed-off-by Eric Bénard <[email protected]>
Looks good enough to me:
Quoted 101 lines
--- recipes/images/qt4-x11-base-image.bb | 30 ++++++++++++++++++++++ recipes/images/qt4-x11-demo-image.bb | 7 +++++ recipes/tasks/task-qt4-x11.bb | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 0 deletions(-) create mode 100644 recipes/images/qt4-x11-base-image.bb create mode 100644 recipes/images/qt4-x11-demo-image.bb create mode 100644 recipes/tasks/task-qt4-x11.bbrecipes/images/qt4-x11-base-image.bb new file +30
-0@@ -0,0 +1,30 @@ +require micro-base-image.bb + +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} \ + ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ + xauth xhost xset xrandr \ +"recipes/images/qt4-x11-demo-image.bb new file +7
-0@@ -0,0 +1,7 @@ +require qt4-x11-base-image.bb + +IMAGE_INSTALL += "\ + qt4-demos qt4-examples qt-demo-init \ + qt4-assistant \ + qwt-examples \ +"recipes/tasks/task-qt4-x11.bb new file +37
-0@@ -0,0 +1,46 @@ +DESCRIPTION = "QT4-X11 base Image Feed" +PR = "r0" +LICENSE = "MIT" + +inherit task + +PACKAGES += " \ + ${PN}-base \ + ${PN}-qwt \ +" + +RDEPENDS_${PN}-base = " \ + qt4-x11-free \ + libqt3support4 \ + libqtclucene4 \ + libqtcore4 \ + libqtdbus4 \ + libqtgui4 \ + libqthelp4 \ + libqtmultimedia4 \ + libqtnetwork4 \ + libqtscript4 \ + libqtscripttools4 \ + libqtsql4 \ + libqtsvg4 \ + libqttest4 \ + libqtwebkit4 \ + libqtxml4 \ + libqtxmlpatterns4 \ + qt4-fonts \ + qt4-plugin-iconengine-svgicon \ + qt4-plugin-imageformat-gif \ + qt4-plugin-imageformat-ico \ + qt4-plugin-imageformat-jpeg \ + qt4-plugin-imageformat-mng \ + qt4-plugin-imageformat-svg \ + qt4-plugin-imageformat-tiff \
recipes/tasks/task-qt4-x11.bb line 46
Quoted 10 lines
recipes/tasks/task-qt4-x11.bb new file +9
-0+ qt4-plugin-phonon-backend-gstreamer \ + qt4-plugin-script-dbus \ + qt4-plugin-sqldriver-sqlite2 \ + qt4-plugin-sqldriver-sqlite \ +" + +RDEPENDS_${PN}-qwt = "\ + qwt \ +"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFM83niMkyGM64RGpERAiqVAJ9R8Dp0IXMR2TTKtm0VNTL9hSBEuACfeqoU tXLGZiFGQrGlGyqcUodOWrU=
=nbCV
-----END PGP SIGNATURE-----
Khem Raj
Acked-byRe: [PATCH] add task-qt4-x11 and qt4-x11 base & demo images
Quoted 4 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1On 28-11-10 15:00, Eric Bénard wrote:
Quoted 8 lines
Quoted 4 lines
these are images integrating qt4-x11-free librarie and its demo applications running using Xorg.
Signed-off-by Eric Bénard <[email protected]>Looks good enough to me:
Acked-by Koen Kooi <[email protected]>
Ditto.
Quoted 127 lines
Quoted 102 lines
---
recipes/images/qt4-x11-base-image.bb | 30 ++++++++++++++++++++++ recipes/images/qt4-x11-demo-image.bb | 7 +++++ recipes/tasks/task-qt4-x11.bb | 46 ++++++++++++++++++++++++++++++++++3 files changed, 83 insertions(+), 0 deletions(-)create mode 100644 recipes/images/qt4-x11-base-image.bb create mode 100644 recipes/images/qt4-x11-demo-image.bb create mode 100644 recipes/tasks/task-qt4-x11.bb
recipes/images/qt4-x11-base-image.bb new file +30
-0@@ -0,0 +1,30 @@ +require micro-base-image.bb + +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} \ + ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ + xauth xhost xset xrandr \ +"recipes/images/qt4-x11-demo-image.bb new file +7
-0@@ -0,0 +1,7 @@ +require qt4-x11-base-image.bb + +IMAGE_INSTALL += "\ + qt4-demos qt4-examples qt-demo-init \ + qt4-assistant \ + qwt-examples \ +"recipes/tasks/task-qt4-x11.bb new file +37
-0@@ -0,0 +1,46 @@ +DESCRIPTION = "QT4-X11 base Image Feed" +PR = "r0" +LICENSE = "MIT" + +inherit task + +PACKAGES += " \ + ${PN}-base \ + ${PN}-qwt \ +" + +RDEPENDS_${PN}-base = " \ + qt4-x11-free \ + libqt3support4 \ + libqtclucene4 \ + libqtcore4 \ + libqtdbus4 \ + libqtgui4 \ + libqthelp4 \ + libqtmultimedia4 \ + libqtnetwork4 \ + libqtscript4 \ + libqtscripttools4 \ + libqtsql4 \ + libqtsvg4 \ + libqttest4 \ + libqtwebkit4 \ + libqtxml4 \ + libqtxmlpatterns4 \ + qt4-fonts \ + qt4-plugin-iconengine-svgicon \ + qt4-plugin-imageformat-gif \ + qt4-plugin-imageformat-ico \ + qt4-plugin-imageformat-jpeg \ + qt4-plugin-imageformat-mng \ + qt4-plugin-imageformat-svg \ + qt4-plugin-imageformat-tiff \recipes/tasks/task-qt4-x11.bb line 46
Quoted 10 lines
recipes/tasks/task-qt4-x11.bb new file +9
-0+ qt4-plugin-phonon-backend-gstreamer \ + qt4-plugin-script-dbus \ + qt4-plugin-sqldriver-sqlite2 \ + qt4-plugin-sqldriver-sqlite \ +" + +RDEPENDS_${PN}-qwt = "\ + qwt \ +"-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)iD8DBQFM83niMkyGM64RGpERAiqVAJ9R8Dp0IXMR2TTKtm0VNTL9hSBEuACfeqoU tXLGZiFGQrGlGyqcUodOWrU=
=nbCV
-----END PGP SIGNATURE-----_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH] add task-qt4-x11 and qt4-x11 base & demo images
Hi Khem,
Quoted 10 lines · Khem Raj
Quoted 9 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 4 lines · Eric Bénard
these are images integrating qt4-x11-free librarie and its demo applications running using Xorg.
Signed-off-by Eric Bénard<[email protected]>
Quoted 7 lines
Quoted 3 lines
Looks good enough to me:
Acked-by Koen Kooi<[email protected]>Ditto.
Acked-by Khem Raj<[email protected]>
can you please cherry pickcb0419cc5fbf3ddf147d689e027a3fe83d368a3e3bd272a80f647987f0dff52b842da93773bf3903
to have the qt4-x11 images in the release ?
Thanks,
Eric
Re: [PATCH] add task-qt4-x11 and qt4-x11 base & demo images
Quoted 7 lines · Eric Bénard
can you please cherry pick
cb0419cc5fbf3ddf147d689e027a3fe83d368a3e3bd272a80f647987f0dff52b842da93773bf3903to have the qt4-x11 images in the release ?
done