From 424dcf7046e4ad09dcc664eb1992201195247fcf Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 29 Aug 2012 11:38:34 +0100 Subject: Rename task to packagegroup "Package group" is a much more appropriate name for these than task, since we use the word task to describe units of work executed by BitBake. Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold --- meta/recipes-qt/images/qt4e-demo-image.bb | 6 +-- meta/recipes-qt/meta/meta-toolchain-qte.bb | 4 +- .../nativesdk-packagegroup-qte-toolchain-host.bb | 7 +++ .../packagegroups/packagegroup-core-qt.bb | 22 +++++++++ meta/recipes-qt/packagegroups/packagegroup-qt4e.bb | 56 ++++++++++++++++++++++ .../packagegroup-qte-toolchain-target.bb | 35 ++++++++++++++ .../tasks/nativesdk-task-qte-toolchain-host.bb | 7 --- meta/recipes-qt/tasks/task-core-qt.bb | 22 --------- meta/recipes-qt/tasks/task-qt4e.bb | 56 ---------------------- meta/recipes-qt/tasks/task-qte-toolchain-target.bb | 35 -------------- 10 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb create mode 100644 meta/recipes-qt/packagegroups/packagegroup-core-qt.bb create mode 100644 meta/recipes-qt/packagegroups/packagegroup-qt4e.bb create mode 100644 meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb delete mode 100644 meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb delete mode 100644 meta/recipes-qt/tasks/task-core-qt.bb delete mode 100644 meta/recipes-qt/tasks/task-qt4e.bb delete mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-target.bb (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 8f9478d961..205c912168 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb @@ -5,15 +5,15 @@ PR="r2" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS += "task-qt4e" +DEPENDS += "packagegroup-qt4e" RDEPENDS_${PN} += " \ - task-qt4e-base \ + packagegroup-qt4e-base \ " IMAGE_INSTALL += "\ ${CORE_IMAGE_BASE_INSTALL} \ - task-qt4e-base \ + packagegroup-qt4e-base \ " inherit core-image diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb index 116db914a1..20dd354e17 100644 --- a/meta/recipes-qt/meta/meta-toolchain-qte.bb +++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb @@ -1,7 +1,7 @@ # Qt Embedded toolchain PR = "r5" -TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" -TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" +TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" require recipes-core/meta/meta-toolchain.bb diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb new file mode 100644 index 0000000000..1c53a9ce2a --- /dev/null +++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb @@ -0,0 +1,7 @@ +require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb + +DESCRIPTION = "Host packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_${PN} += "nativesdk-qt4-tools" diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb new file mode 100644 index 0000000000..4fe07c654e --- /dev/null +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb @@ -0,0 +1,22 @@ +# +# Copyright (C) 2010 Intel Corporation. All rights reserved +# + +DESCRIPTION = "Qt Tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r3" + +PACKAGES = "\ + packagegroup-core-qt-demos \ + packagegroup-core-qt-demos-dbg \ + packagegroup-core-qt-demos-dev \ + " + +ALLOW_EMPTY = "1" + +QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" +#QTDEMOS_disabled = "fotowall" + +RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}" diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb new file mode 100644 index 0000000000..4b6d6a70c1 --- /dev/null +++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb @@ -0,0 +1,56 @@ +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)}' + +PACKAGES += " \ + ${PN}-base \ +" + +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 \ +" + diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb new file mode 100644 index 0000000000..abd6a1fcbe --- /dev/null +++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Target packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PR = "r5" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +RDEPENDS_${PN} += " \ + packagegroup-core-standalone-sdk-target \ + qt4-embedded-mkspecs \ + libqt-embeddedmultimedia4-dev \ + libqt-embeddedphonon4-dev \ + libqt-embedded3support4-dev \ + libqt-embeddedclucene4-dev \ + libqt-embeddedcore4-dev \ + libqt-embeddeddbus4-dev \ + libqt-embeddeddesignercomponents4-dev \ + libqt-embeddeddesigner4-dev \ + libqt-embeddeduitools4-dev \ + libqt-embeddedgui4-dev \ + libqt-embeddedhelp4-dev \ + libqt-embeddednetwork4-dev \ + libqt-embeddedscript4-dev \ + libqt-embeddedscripttools4-dev \ + libqt-embeddedsql4-dev \ + libqt-embeddedsvg4-dev \ + libqt-embeddedtest4-dev \ + libqt-embeddedwebkit4-dev \ + libqt-embeddedxml4-dev \ + libsqlite3-dev \ + expat-dev \ + " + diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb deleted file mode 100644 index 5098d11388..0000000000 --- a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-core/tasks/nativesdk-task-sdk-host.bb - -DESCRIPTION = "Host packages for Qt Embedded SDK" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -RDEPENDS_${PN} += "nativesdk-qt4-tools" diff --git a/meta/recipes-qt/tasks/task-core-qt.bb b/meta/recipes-qt/tasks/task-core-qt.bb deleted file mode 100644 index 69512a4b9f..0000000000 --- a/meta/recipes-qt/tasks/task-core-qt.bb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation. All rights reserved -# - -DESCRIPTION = "Qt Tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r3" - -PACKAGES = "\ - task-core-qt-demos \ - task-core-qt-demos-dbg \ - task-core-qt-demos-dev \ - " - -ALLOW_EMPTY = "1" - -QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" -#QTDEMOS_disabled = "fotowall" - -RDEPENDS_task-core-qt-demos = "${QTDEMOS}" diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/tasks/task-qt4e.bb deleted file mode 100644 index c95c898538..0000000000 --- a/meta/recipes-qt/tasks/task-qt4e.bb +++ /dev/null @@ -1,56 +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 task - -TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' - -PACKAGES += " \ - ${PN}-base \ -" - -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 \ -" - diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb deleted file mode 100644 index 7ee575f2eb..0000000000 --- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Target packages for Qt Embedded SDK" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PR = "r5" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -RDEPENDS_${PN} += " \ - task-core-standalone-sdk-target \ - qt4-embedded-mkspecs \ - libqt-embeddedmultimedia4-dev \ - libqt-embeddedphonon4-dev \ - libqt-embedded3support4-dev \ - libqt-embeddedclucene4-dev \ - libqt-embeddedcore4-dev \ - libqt-embeddeddbus4-dev \ - libqt-embeddeddesignercomponents4-dev \ - libqt-embeddeddesigner4-dev \ - libqt-embeddeduitools4-dev \ - libqt-embeddedgui4-dev \ - libqt-embeddedhelp4-dev \ - libqt-embeddednetwork4-dev \ - libqt-embeddedscript4-dev \ - libqt-embeddedscripttools4-dev \ - libqt-embeddedsql4-dev \ - libqt-embeddedsvg4-dev \ - libqt-embeddedtest4-dev \ - libqt-embeddedwebkit4-dev \ - libqt-embeddedxml4-dev \ - libsqlite3-dev \ - expat-dev \ - " - -- cgit 1.2.3-korg