From 07db74000443c473db401df598c4654fa6660436 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 30 Aug 2012 13:58:00 +0100 Subject: packagegroup-qt4e: tidy up and rename * Eliminate the -base package, there's only one package and it might as well be the main one. * Rename to packagegroup-core-qt4e to match other package group recipes * Fix and tidy up qt4e-demo-image at the same time (From OE-Core rev: 9dddc9dfdc84401fee3b48eb3aba0cabdcf4d05a) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-qt/images/qt4e-demo-image.bb | 10 +--- .../packagegroups/packagegroup-core-qt4e.bb | 52 +++++++++++++++++++++ meta/recipes-qt/packagegroups/packagegroup-qt4e.bb | 54 ---------------------- 3 files changed, 54 insertions(+), 62 deletions(-) create mode 100644 meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb delete mode 100644 meta/recipes-qt/packagegroups/packagegroup-qt4e.bb (limited to 'meta') diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 205c912168..9e8b3379ff 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb @@ -1,19 +1,13 @@ DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." LICENSE = "MIT" -PR="r2" +PR = "r3" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS += "packagegroup-qt4e" - -RDEPENDS_${PN} += " \ - packagegroup-qt4e-base \ - " - IMAGE_INSTALL += "\ ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-qt4e-base \ + packagegroup-core-qt4e \ " inherit core-image diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb new file mode 100644 index 0000000000..2ea9c2e551 --- /dev/null +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "QT4 Embedded base Image Feed" +PR = "r1" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit packagegroup + +TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' + +RDEPENDS_${PN} = " \ + qt4-embedded \ + libqt-embedded3support4 \ + libqt-embeddedclucene4 \ + libqt-embeddedcore4 \ + libqt-embeddeddbus4 \ + libqt-embeddedgui4 \ + libqt-embeddedhelp4 \ + libqt-embeddedmultimedia4 \ + libqt-embeddednetwork4 \ + libqt-embeddedscript4 \ + libqt-embeddedscripttools4 \ + libqt-embeddedsql4 \ + libqt-embeddedsvg4 \ + libqt-embeddedtest4 \ + libqt-embeddedwebkit4 \ + libqt-embeddedxml4 \ + qt4-embedded-fonts-ttf-dejavu \ + qt4-embedded-fonts-ttf-vera \ + qt4-embedded-plugin-iconengine-svgicon \ + qt4-embedded-plugin-imageformat-gif \ + qt4-embedded-plugin-imageformat-ico \ + qt4-embedded-plugin-imageformat-jpeg \ + qt4-embedded-plugin-imageformat-mng \ + qt4-embedded-plugin-imageformat-svg \ + qt4-embedded-plugin-imageformat-tiff \ + qt4-embedded-plugin-mousedriver-tslib \ + qt4-embedded-plugin-phonon-backend-gstreamer \ + qt4-embedded-plugin-script-dbus \ + qt4-embedded-plugin-sqldriver-sqlite \ + ${TOUCH} \ + qt4-embedded-demos \ + qt4-embedded-examples \ + qt-demo-init \ + qt4-embedded-assistant \ +" + +RRECOMMENDS_${PN} = " \ + libqt-embeddedxmlpatterns4 \ +" + diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb deleted file mode 100644 index 2ee7959c0c..0000000000 --- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "QT4 Embedded base Image Feed" -PR = "r1" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit packagegroup - -PACKAGES = "${PN}-base" - -TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' - -RDEPENDS_${PN}-base = " \ - qt4-embedded \ - libqt-embedded3support4 \ - libqt-embeddedclucene4 \ - libqt-embeddedcore4 \ - libqt-embeddeddbus4 \ - libqt-embeddedgui4 \ - libqt-embeddedhelp4 \ - libqt-embeddedmultimedia4 \ - libqt-embeddednetwork4 \ - libqt-embeddedscript4 \ - libqt-embeddedscripttools4 \ - libqt-embeddedsql4 \ - libqt-embeddedsvg4 \ - libqt-embeddedtest4 \ - libqt-embeddedwebkit4 \ - libqt-embeddedxml4 \ - qt4-embedded-fonts-ttf-dejavu \ - qt4-embedded-fonts-ttf-vera \ - qt4-embedded-plugin-iconengine-svgicon \ - qt4-embedded-plugin-imageformat-gif \ - qt4-embedded-plugin-imageformat-ico \ - qt4-embedded-plugin-imageformat-jpeg \ - qt4-embedded-plugin-imageformat-mng \ - qt4-embedded-plugin-imageformat-svg \ - qt4-embedded-plugin-imageformat-tiff \ - qt4-embedded-plugin-mousedriver-tslib \ - qt4-embedded-plugin-phonon-backend-gstreamer \ - qt4-embedded-plugin-script-dbus \ - qt4-embedded-plugin-sqldriver-sqlite \ - ${TOUCH} \ - qt4-embedded-demos \ - qt4-embedded-examples \ - qt-demo-init \ - qt4-embedded-assistant \ -" - -RRECOMMENDS_${PN}-base = " \ - libqt-embeddedxmlpatterns4 \ -" - -- cgit v1.2.3-54-g00ecf