diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-29 11:38:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:52:55 +0100 |
commit | 272cb74d70686cb7f72005dc25e02f38b46ecd57 (patch) | |
tree | 3a5e4cb0c9a2e407b2d04c78b1eb51d0f429ca64 /meta/recipes-qt | |
parent | f1df3f828bfc9e70bf8cf5a7c2e2cf216944785a (diff) | |
download | ast2050-yocto-poky-272cb74d70686cb7f72005dc25e02f38b46ecd57.zip ast2050-yocto-poky-272cb74d70686cb7f72005dc25e02f38b46ecd57.tar.gz |
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.
(From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/images/qt4e-demo-image.bb | 6 | ||||
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qte.bb | 4 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb (renamed from meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-core-qt.bb (renamed from meta/recipes-qt/tasks/task-core-qt.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-qt4e.bb (renamed from meta/recipes-qt/tasks/task-qt4e.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb (renamed from meta/recipes-qt/tasks/task-qte-toolchain-target.bb) | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 8f9478d..205c912 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 116db91..20dd354 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/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb index 5098d11..1c53a9c 100644 --- a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb +++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb @@ -1,4 +1,4 @@ -require recipes-core/tasks/nativesdk-task-sdk-host.bb +require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb DESCRIPTION = "Host packages for Qt Embedded SDK" LICENSE = "MIT" diff --git a/meta/recipes-qt/tasks/task-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb index 69512a4..4fe07c6 100644 --- a/meta/recipes-qt/tasks/task-core-qt.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r3" PACKAGES = "\ - task-core-qt-demos \ - task-core-qt-demos-dbg \ - task-core-qt-demos-dev \ + packagegroup-core-qt-demos \ + packagegroup-core-qt-demos-dbg \ + packagegroup-core-qt-demos-dev \ " ALLOW_EMPTY = "1" @@ -19,4 +19,4 @@ ALLOW_EMPTY = "1" QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" #QTDEMOS_disabled = "fotowall" -RDEPENDS_task-core-qt-demos = "${QTDEMOS}" +RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}" diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb index c95c898..4b6d6a7 100644 --- a/meta/recipes-qt/tasks/task-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -inherit task +inherit packagegroup TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb index 7ee575f..abd6a1f 100644 --- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} += " \ - task-core-standalone-sdk-target \ + packagegroup-core-standalone-sdk-target \ qt4-embedded-mkspecs \ libqt-embeddedmultimedia4-dev \ libqt-embeddedphonon4-dev \ |