From 272cb74d70686cb7f72005dc25e02f38b46ecd57 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. (From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/images/core-image-clutter.bb | 6 ++-- .../images/core-image-gtk-directfb.bb | 8 ++--- .../packagegroups/packagegroup-core-clutter.bb | 37 ++++++++++++++++++++++ .../packagegroup-core-gtk-directfb.bb | 26 +++++++++++++++ meta/recipes-graphics/tasks/task-core-clutter.bb | 37 ---------------------- .../tasks/task-core-gtk-directfb.bb | 26 --------------- 6 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb delete mode 100644 meta/recipes-graphics/tasks/task-core-clutter.bb delete mode 100644 meta/recipes-graphics/tasks/task-core-gtk-directfb.bb (limited to 'meta/recipes-graphics') 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" IMAGE_INSTALL = "\ ${CORE_IMAGE_BASE_INSTALL} \ - task-core-clutter-core \ - task-core-clutter-tests \ - task-core-clutter-apps" + packagegroup-core-clutter-core \ + packagegroup-core-clutter-tests \ + packagegroup-core-clutter-apps" 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 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS += "task-core-gtk-directfb" +DEPENDS += "packagegroup-core-gtk-directfb" RDEPENDS_${PN} += " \ - task-core-gtk-directfb-base \ + packagegroup-core-gtk-directfb-base \ " inherit core-image IMAGE_INSTALL += "\ ${CORE_IMAGE_BASE_INSTALL} \ - task-core-basic \ - task-core-gtk-directfb-base \ + packagegroup-core-basic \ + packagegroup-core-gtk-directfb-base \ " 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 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Clutter Tasks for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PR = "r4" + +PACKAGES = "\ + packagegroup-core-clutter-core \ + packagegroup-core-clutter-core-dbg \ + packagegroup-core-clutter-core-dev \ + packagegroup-core-clutter-apps \ + packagegroup-core-clutter-apps-dbg \ + packagegroup-core-clutter-apps-dev \ + packagegroup-core-clutter-tests \ + packagegroup-core-clutter-tests-dbg \ + packagegroup-core-clutter-tests-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_packagegroup-core-clutter-core = "\ + clutter-1.8 \ + clutter-gst-1.8 \ + clutter-gtk-1.8 \ + " + +#RDEPENDS_packagegroup-core-clutter-tests = "\ +# clutter-gst-1.8-examples \ +# clutter-gtk-1.8-examples" + +#RDEPENDS_packagegroup-core-clutter-apps = "\ +# clutter-box2d " diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb new file mode 100644 index 0000000000..8609013e9e --- /dev/null +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "gkt+ over directfb without x11" +PR = "r0" +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 = " \ + directfb \ + directfb-examples \ + pango \ + pango-modules \ + fontconfig \ + gtk+ \ + gtk-demo \ + dropbear \ + ${TOUCH} \ +" 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 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Clutter Tasks for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PR = "r4" - -PACKAGES = "\ - task-core-clutter-core \ - task-core-clutter-core-dbg \ - task-core-clutter-core-dev \ - task-core-clutter-apps \ - task-core-clutter-apps-dbg \ - task-core-clutter-apps-dev \ - task-core-clutter-tests \ - task-core-clutter-tests-dbg \ - task-core-clutter-tests-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-core-clutter-core = "\ - clutter-1.8 \ - clutter-gst-1.8 \ - clutter-gtk-1.8 \ - " - -#RDEPENDS_task-core-clutter-tests = "\ -# clutter-gst-1.8-examples \ -# clutter-gtk-1.8-examples" - -#RDEPENDS_task-core-clutter-apps = "\ -# clutter-box2d " diff --git a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb b/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb deleted file mode 100644 index 239e0c1984..0000000000 --- a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "gkt+ over directfb without x11" -PR = "r0" -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 = " \ - directfb \ - directfb-examples \ - pango \ - pango-modules \ - fontconfig \ - gtk+ \ - gtk-demo \ - dropbear \ - ${TOUCH} \ -" -- cgit v1.2.3-54-g00ecf