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-graphics | |
| parent | f1df3f828bfc9e70bf8cf5a7c2e2cf216944785a (diff) | |
| download | 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-graphics')
| -rw-r--r-- | meta/recipes-graphics/images/core-image-clutter.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-graphics/images/core-image-gtk-directfb.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | 37 | ||||
| -rw-r--r-- | meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb (renamed from meta/recipes-graphics/tasks/task-core-gtk-directfb.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/tasks/task-core-clutter.bb | 37 |
5 files changed, 45 insertions, 45 deletions
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index aa6e2a2bdd..4c5adee48e 100644 --- a/meta/recipes-graphics/images/core-image-clutter.bb +++ b/meta/recipes-graphics/images/core-image-clutter.bb | |||
| @@ -7,8 +7,8 @@ LICENSE = "MIT" | |||
| 7 | 7 | ||
| 8 | IMAGE_INSTALL = "\ | 8 | IMAGE_INSTALL = "\ |
| 9 | ${CORE_IMAGE_BASE_INSTALL} \ | 9 | ${CORE_IMAGE_BASE_INSTALL} \ |
| 10 | task-core-clutter-core \ | 10 | packagegroup-core-clutter-core \ |
| 11 | task-core-clutter-tests \ | 11 | packagegroup-core-clutter-tests \ |
| 12 | task-core-clutter-apps" | 12 | packagegroup-core-clutter-apps" |
| 13 | 13 | ||
| 14 | inherit core-image | 14 | inherit core-image |
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb index dcf5165b2e..868b3097f2 100644 --- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb +++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb | |||
| @@ -6,18 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
| 6 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 6 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
| 7 | 7 | ||
| 8 | 8 | ||
| 9 | DEPENDS += "task-core-gtk-directfb" | 9 | DEPENDS += "packagegroup-core-gtk-directfb" |
| 10 | 10 | ||
| 11 | RDEPENDS_${PN} += " \ | 11 | RDEPENDS_${PN} += " \ |
| 12 | task-core-gtk-directfb-base \ | 12 | packagegroup-core-gtk-directfb-base \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | inherit core-image | 15 | inherit core-image |
| 16 | 16 | ||
| 17 | IMAGE_INSTALL += "\ | 17 | IMAGE_INSTALL += "\ |
| 18 | ${CORE_IMAGE_BASE_INSTALL} \ | 18 | ${CORE_IMAGE_BASE_INSTALL} \ |
| 19 | task-core-basic \ | 19 | packagegroup-core-basic \ |
| 20 | task-core-gtk-directfb-base \ | 20 | packagegroup-core-gtk-directfb-base \ |
| 21 | " | 21 | " |
| 22 | 22 | ||
| 23 | python __anonymous () { | 23 | python __anonymous () { |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb new file mode 100644 index 0000000000..039f5c6914 --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | # | ||
| 2 | # Copyright (C) 2007 OpenedHand Ltd. | ||
| 3 | # | ||
| 4 | |||
| 5 | DESCRIPTION = "Clutter Tasks for OpenedHand Poky" | ||
| 6 | LICENSE = "MIT" | ||
| 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
| 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
| 9 | |||
| 10 | PR = "r4" | ||
| 11 | |||
| 12 | PACKAGES = "\ | ||
| 13 | packagegroup-core-clutter-core \ | ||
| 14 | packagegroup-core-clutter-core-dbg \ | ||
| 15 | packagegroup-core-clutter-core-dev \ | ||
| 16 | packagegroup-core-clutter-apps \ | ||
| 17 | packagegroup-core-clutter-apps-dbg \ | ||
| 18 | packagegroup-core-clutter-apps-dev \ | ||
| 19 | packagegroup-core-clutter-tests \ | ||
| 20 | packagegroup-core-clutter-tests-dbg \ | ||
| 21 | packagegroup-core-clutter-tests-dev \ | ||
| 22 | " | ||
| 23 | |||
| 24 | ALLOW_EMPTY = "1" | ||
| 25 | |||
| 26 | RDEPENDS_packagegroup-core-clutter-core = "\ | ||
| 27 | clutter-1.8 \ | ||
| 28 | clutter-gst-1.8 \ | ||
| 29 | clutter-gtk-1.8 \ | ||
| 30 | " | ||
| 31 | |||
| 32 | #RDEPENDS_packagegroup-core-clutter-tests = "\ | ||
| 33 | # clutter-gst-1.8-examples \ | ||
| 34 | # clutter-gtk-1.8-examples" | ||
| 35 | |||
| 36 | #RDEPENDS_packagegroup-core-clutter-apps = "\ | ||
| 37 | # clutter-box2d " | ||
diff --git a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb index 239e0c1984..8609013e9e 100644 --- a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
| 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
| 6 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 6 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
| 7 | 7 | ||
| 8 | inherit task | 8 | inherit packagegroup |
| 9 | 9 | ||
| 10 | TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' | 10 | TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' |
| 11 | 11 | ||
diff --git a/meta/recipes-graphics/tasks/task-core-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb deleted file mode 100644 index 4044131cc2..0000000000 --- a/meta/recipes-graphics/tasks/task-core-clutter.bb +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Copyright (C) 2007 OpenedHand Ltd. | ||
| 3 | # | ||
| 4 | |||
| 5 | DESCRIPTION = "Clutter Tasks for OpenedHand Poky" | ||
| 6 | LICENSE = "MIT" | ||
| 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | ||
| 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
| 9 | |||
| 10 | PR = "r4" | ||
| 11 | |||
| 12 | PACKAGES = "\ | ||
| 13 | task-core-clutter-core \ | ||
| 14 | task-core-clutter-core-dbg \ | ||
| 15 | task-core-clutter-core-dev \ | ||
| 16 | task-core-clutter-apps \ | ||
| 17 | task-core-clutter-apps-dbg \ | ||
| 18 | task-core-clutter-apps-dev \ | ||
| 19 | task-core-clutter-tests \ | ||
| 20 | task-core-clutter-tests-dbg \ | ||
| 21 | task-core-clutter-tests-dev \ | ||
| 22 | " | ||
| 23 | |||
| 24 | ALLOW_EMPTY = "1" | ||
| 25 | |||
| 26 | RDEPENDS_task-core-clutter-core = "\ | ||
| 27 | clutter-1.8 \ | ||
| 28 | clutter-gst-1.8 \ | ||
| 29 | clutter-gtk-1.8 \ | ||
| 30 | " | ||
| 31 | |||
| 32 | #RDEPENDS_task-core-clutter-tests = "\ | ||
| 33 | # clutter-gst-1.8-examples \ | ||
| 34 | # clutter-gtk-1.8-examples" | ||
| 35 | |||
| 36 | #RDEPENDS_task-core-clutter-apps = "\ | ||
| 37 | # clutter-box2d " | ||
