Package group fixes

index 52836d2..f401313 100644
@@ -64,8 +64,7 @@ IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
 
 X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
 ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
-SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear"
-SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}"
+SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
 
 inherit image
 

index 689315b..18ed0cd 100644
@@ -3,9 +3,7 @@ core-image-sato plus meta-toolchain, development headers and libraries to \
 form a standalone SDK."
 
 IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \
-	tools-debug tools-profile tools-testapps debug-tweaks"
-
-SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh"
+	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
 
 LICENSE = "MIT"
 

index f401313..d6dd646 100644
@@ -62,10 +62,6 @@ CORE_IMAGE_EXTRA_INSTALL ?= ""
 
 IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
 
-X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
-ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
-SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
-
 inherit image
 
 # Create /etc/timestamp during image construction to give a reasonably sane default time setting

index ed33e12..ea6ba7e 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
 and file manager."
 
-IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
 
 LICENSE = "MIT"
 

index 6c49a02..aa6e2a2 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
 which enables development of rich and animated graphical user interfaces."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 

index 5ee9a04..b3db2e6 100644
@@ -2,8 +2,6 @@ DESCRIPTION = "Image with Sato for development work. It includes everything \
 within core-image-sato plus a native toolchain, application development and \
 testing libraries, profiling and debug symbols."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
+require core-image-sato.bb
 
-LICENSE = "MIT"
-
-inherit core-image
+IMAGE_FEATURES += "dev-pkgs"

index 18ed0cd..c462254 100644
@@ -2,12 +2,10 @@ DESCRIPTION = "Image with Sato support that includes everything within \
 core-image-sato plus meta-toolchain, development headers and libraries to \
 form a standalone SDK."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \
-	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
-
-LICENSE = "MIT"
+require core-image-sato.bb
 
-inherit core-image
+IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
+	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
 
 IMAGE_INSTALL += "kernel-dev"
 

index c228a35..4bbf099 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
 mobile devices. The image supports X11 with a Sato theme, Pimlico \
 applications, and contains terminal, editor, and file manager."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 

index d6dd646..a37cdfc 100644
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # - tools-debug         - debugging tools
 # - tools-profile       - profiling tools
 # - tools-testapps      - tools usable to make some device tests
-# - nfs-server          - NFS server (exports / over NFS to everybody)
+# - nfs-server          - NFS server
 # - ssh-server-dropbear - SSH server (dropbear)
 # - ssh-server-openssh  - SSH server (openssh)
 # - debug-tweaks        - makes an image suitable for development

index 3146d02..160a3aa 100644
@@ -188,11 +188,11 @@ def get_applying_patches(d):
 
 def not_tarball(d):
     """
-    packages including key words 'work-shared', 'native', 'task-' will be passed
+    packages including key words 'work-shared', 'native', 'packagegroup-' will be passed
     """
     workdir = d.getVar('WORKDIR', True)
     s = d.getVar('S', True)
-    if 'work-shared' in s or 'task-' in workdir or 'native' in workdir:
+    if 'work-shared' in s or 'packagegroup-' in workdir or 'native' in workdir:
         return True
     else:
         return False

index a37cdfc..a85a9ea 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 # IMAGE_FEATURES control content of the core reference images
 # 
-# By default we install task-core-boot and task-base packages - this gives us
+# By default we install packagegroup-core-boot and packagegroup-base packages - this gives us
 # working (console only) rootfs.
 #
 # Available IMAGE_FEATURES:

@@ -27,21 +27,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # - ssh-server-openssh  - SSH server (openssh)
 # - debug-tweaks        - makes an image suitable for development
 #
-PACKAGE_GROUP_apps-console-core = "task-core-apps-console"
-PACKAGE_GROUP_x11-mini = "task-core-x11-mini"
-PACKAGE_GROUP_x11-base = "task-core-x11-base"
-PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
-PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
-PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
-PACKAGE_GROUP_tools-debug = "task-core-tools-debug"
-PACKAGE_GROUP_tools-profile = "task-core-tools-profile"
-PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps"
-PACKAGE_GROUP_tools-sdk = "task-core-sdk task-core-standalone-sdk-target"
-PACKAGE_GROUP_nfs-server = "task-core-nfs-server"
-PACKAGE_GROUP_ssh-server-dropbear = "task-core-ssh-dropbear"
-PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"
+PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
+PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
+PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
+PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
+PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
+PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
+PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
+PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
+PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"
+PACKAGE_GROUP_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target"
+PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
+PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
+PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
 PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
-PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
+PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos"
 
 
 # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'

@@ -52,8 +52,8 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
 # An error exception would be raised if both image features foo and bar1(or bar2) are included
 
 CORE_IMAGE_BASE_INSTALL = '\
-    task-core-boot \
-    task-base-extended \
+    packagegroup-core-boot \
+    packagegroup-base-extended \
     \
     ${CORE_IMAGE_EXTRA_INSTALL} \
     '

index 6de14e0..e74eb3f 100644
@@ -591,7 +591,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, d):
         return True
 
     sane = True
-    if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg:
+    if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
         # Copied from package_ipk.bbclass
         # boiler plate to update the data
         localdata = bb.data.createCopy(d)

index 78af693..c8aafc9 100644
@@ -1763,7 +1763,7 @@ python package_depchains() {
             for dep in pkglibdeps[pkg]:
                 add_dep(pkglibdeplist, dep)
         # FIXME this should not look at PN once all task recipes inherit from task.bbclass
-        dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('task-'))
+        dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('packagegroup-'))
 
     for suffix in pkgs:
         for pkg in pkgs[suffix]:

new file mode 100644
index 0000000..6ec154a
@@ -0,0 +1,30 @@
+# Task packages are only used to pull in other packages
+# via their dependencies. They are empty.
+ALLOW_EMPTY = "1"
+
+# By default, only the task package itself is in PACKAGES.
+# -dbg and -dev flavours are handled by the anonfunc below.
+# This means that task recipes used to build multiple task
+# packages have to modify PACKAGES after inheriting task.bbclass.
+PACKAGES = "${PN}"
+
+# By default, task packages do not depend on a certain architecture.
+# Only if dependencies are modified by MACHINE_FEATURES, packages
+# need to be set to MACHINE_ARCH after inheriting task.bbclass
+PACKAGE_ARCH = "all"
+
+# This automatically adds -dbg and -dev flavours of all PACKAGES
+# to the list. Their dependencies (RRECOMMENDS) are handled as usual
+# by package_depchains in a following step.
+python () {
+    packages = d.getVar('PACKAGES', True).split()
+    genpackages = []
+    for pkg in packages:
+        for postfix in ['-dbg', '-dev']:
+            genpackages.append(pkg+postfix)
+    d.setVar('PACKAGES', ' '.join(packages+genpackages))
+}
+
+# We don't want to look at shared library dependencies for the
+# dbg packages
+DEPCHAIN_DBGDEFAULTDEPS = "1"

index c9fb00d..1c151d7 100644
@@ -7,9 +7,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
 SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}"
 
-TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
-TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
+TOOLCHAIN_TARGET_TASK ?= "packagegroup-core-standalone-sdk-target packagegroup-core-standalone-sdk-target-dbg"
 TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
 

index 6ec154a..28db500 100644
@@ -1,30 +1,6 @@
-# Task packages are only used to pull in other packages
-# via their dependencies. They are empty.
-ALLOW_EMPTY = "1"
-
-# By default, only the task package itself is in PACKAGES.
-# -dbg and -dev flavours are handled by the anonfunc below.
-# This means that task recipes used to build multiple task
-# packages have to modify PACKAGES after inheriting task.bbclass.
-PACKAGES = "${PN}"
-
-# By default, task packages do not depend on a certain architecture.
-# Only if dependencies are modified by MACHINE_FEATURES, packages
-# need to be set to MACHINE_ARCH after inheriting task.bbclass
-PACKAGE_ARCH = "all"
-
-# This automatically adds -dbg and -dev flavours of all PACKAGES
-# to the list. Their dependencies (RRECOMMENDS) are handled as usual
-# by package_depchains in a following step.
-python () {
-    packages = d.getVar('PACKAGES', True).split()
-    genpackages = []
-    for pkg in packages:
-        for postfix in ['-dbg', '-dev']:
-            genpackages.append(pkg+postfix)
-    d.setVar('PACKAGES', ' '.join(packages+genpackages))
+python __anonymous() {
+    bb.warn("%s: task.bbclass is deprecated, please inherit packagegroup instead" % d.getVar("PN", True))
 }
 
-# We don't want to look at shared library dependencies for the
-# dbg packages
-DEPCHAIN_DBGDEFAULTDEPS = "1"
+inherit packagegroup
+

index 1d56813..702fc50 100644
@@ -691,7 +691,7 @@ SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 IMAGE_FSTYPES ?= "tar.gz"
 INITRAMFS_FSTYPES ?= "cpio.gz"
 PCMCIA_MANAGER ?= "pcmciautils"
-DEFAULT_TASK_PROVIDER ?= "task-base"
+DEFAULT_TASK_PROVIDER ?= "packagegroup-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
 IMAGE_ROOTFS_SIZE ?= "65536"
 

@@ -705,7 +705,7 @@ CACHE := "${CACHE}"
 OES_BITBAKE_CONF = "1"
 
 ##################################################################
-# Machine properties and task-base stuff
+# Machine properties and packagegroup-base stuff
 ##################################################################
 
 DISTRO_FEATURES ?= ""

index 8305f3a..5f7be28 100644
@@ -37,7 +37,7 @@ pkg_postinst_${PN} () {
         sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
 }
 
-RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} task-core-nfs-server oprofileui-server rsync bash"
+RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} packagegroup-core-nfs-server oprofileui-server rsync bash"
 
 inherit update-rc.d allarch
 

index 87eee1a..a86daa5 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation.  For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>."
-IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
+IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-apps-console packagegroup-core-ssh-openssh packagegroup-self-hosted"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \

index 089a728..0d2613e 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "A small image just capable of allowing a device to boot."
 
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
+IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
 
 IMAGE_LINGUAS = " "
 

index 512810b..5d80574 100644
@@ -1,4 +1,4 @@
-TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg"
+TOOLCHAIN_TARGET_GMAETASK ?= "packagegroup-core-standalone-gmae-sdk-target packagegroup-core-standalone-gmae-sdk-target-dbg"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}"
 PROVIDES = "meta-toolchain-sdk"

similarity index 100%
rename from meta/recipes-core/tasks/nativesdk-task-sdk-host.bb
rename to meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb

418 lines not on this page · raw message

similarity index 88%
rename from meta/recipes-core/tasks/task-core-boot.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 2947509..7e80fff 100644
@@ -25,12 +25,12 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts"
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 
 PACKAGES = "\
-    task-core-boot \
-    task-core-boot-dbg \
-    task-core-boot-dev \
+    packagegroup-core-boot \
+    packagegroup-core-boot-dbg \
+    packagegroup-core-boot-dev \
 "
 
-RDEPENDS_task-core-boot = "\
+RDEPENDS_packagegroup-core-boot = "\
     base-files \
     base-passwd \
     busybox \

@@ -45,5 +45,5 @@ RDEPENDS_task-core-boot = "\
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
-RRECOMMENDS_task-core-boot = "\
+RRECOMMENDS_packagegroup-core-boot = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

similarity index 73%
rename from meta/recipes-core/tasks/task-core-console.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-console.bb
index cb22732..fd8eb25 100644
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r35"
 
 PACKAGES = "\
-    task-core-apps-console \
-    task-core-apps-console-dbg \
-    task-core-apps-console-dev \
+    packagegroup-core-apps-console \
+    packagegroup-core-apps-console-dbg \
+    packagegroup-core-apps-console-dev \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -20,7 +20,7 @@ ALLOW_EMPTY = "1"
 
 SPLASH ?= "psplash"
 
-RDEPENDS_task-core-apps-console = "\
+RDEPENDS_packagegroup-core-apps-console = "\
     avahi-daemon \
     dbus \
     portmap \

similarity index 65%
rename from meta/recipes-core/tasks/task-core-nfs.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 5c7f455..e63753b 100644
@@ -9,14 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r1"
 
 PACKAGES = "\
-    task-core-nfs-server \
-    task-core-nfs-server-dbg \
-    task-core-nfs-server-dev \
+    packagegroup-core-nfs-server \
+    packagegroup-core-nfs-server-dbg \
+    packagegroup-core-nfs-server-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-core-nfs-server = "\
+RDEPENDS_packagegroup-core-nfs-server = "\
     nfs-utils \
     nfs-utils-client \
     "

@@ -24,5 +24,5 @@ RDEPENDS_task-core-nfs-server = "\
 # rpcinfo can be useful but only with glibc images
 GLIBC_DEPENDENCIES = "glibc-utils"
 
-RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
 

similarity index 85%
rename from meta/recipes-core/tasks/task-core-sdk.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index fe95236..663f705 100644
@@ -6,18 +6,18 @@ DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS = "task-core-console"
+DEPENDS = "packagegroup-core-console"
 PR = "r8"
 
 ALLOW_EMPTY = "1"
 #PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
 PACKAGES = "\
-    task-core-sdk \
-    task-core-sdk-dbg \
-    task-core-sdk-dev"
+    packagegroup-core-sdk \
+    packagegroup-core-sdk-dbg \
+    packagegroup-core-sdk-dev"
 
-RDEPENDS_task-core-sdk = "\
+RDEPENDS_packagegroup-core-sdk = "\
     autoconf \
     automake \
     binutils \

@@ -48,15 +48,15 @@ RDEPENDS_task-core-sdk = "\
     file \
     tcl"
 
-RRECOMMENDS_task-core-sdk = "\
+RRECOMMENDS_packagegroup-core-sdk = "\
     libgomp \
     libgomp-dev"
 
 #python generate_sdk_pkgs () {
-#    poky_pkgs = read_pkgdata('task-core', d)['PACKAGES']
+#    poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES']
 #    pkgs = d.getVar('PACKAGES', True).split()
 #    for pkg in poky_pkgs.split():
-#        newpkg = pkg.replace('task-core', 'task-core-sdk')
+#        newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk')
 #
 #        # for each of the task packages, add a corresponding sdk task
 #        pkgs.append(newpkg)

@@ -91,4 +91,4 @@ RRECOMMENDS_task-core-sdk = "\
 #    d.setVar('PACKAGES', ' '.join(pkgs))
 #}
 #
-#PACKAGES_DYNAMIC = "task-core-sdk-*"
+#PACKAGES_DYNAMIC = "packagegroup-core-sdk-*"

similarity index 49%
rename from meta/recipes-core/tasks/task-core-ssh-dropbear.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 1e7402e..9dcc342 100644
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r0"
 
 PACKAGES = "\
-    task-core-ssh-dropbear \
-    task-core-ssh-dropbear-dbg \
-    task-core-ssh-dropbear-dev \
+    packagegroup-core-ssh-dropbear \
+    packagegroup-core-ssh-dropbear-dbg \
+    packagegroup-core-ssh-dropbear-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-core-ssh-dropbear = "dropbear"
-RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg"
-RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev"
+RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear"
+RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg"
+RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev"

similarity index 50%
rename from meta/recipes-core/tasks/task-core-ssh-openssh.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 794399a..7e85b29 100644
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r0"
 
 PACKAGES = "\
-    task-core-ssh-openssh \
-    task-core-ssh-openssh-dbg \
-    task-core-ssh-openssh-dev \
+    packagegroup-core-ssh-openssh \
+    packagegroup-core-ssh-openssh-dbg \
+    packagegroup-core-ssh-openssh-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-core-ssh-openssh = "openssh"
-RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg"
-RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev"
+RDEPENDS_packagegroup-core-ssh-openssh = "openssh"
+RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg"
+RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev"

similarity index 100%
rename from meta/recipes-core/tasks/task-core-standalone-sdk-target.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb

similarity index 100%
rename from meta/recipes-core/tasks/task-core-tools-debug.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb

similarity index 100%
rename from meta/recipes-core/tasks/task-core-tools-profile.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb

similarity index 100%
rename from meta/recipes-core/tasks/task-core-tools-testapps.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb

similarity index 90%
rename from meta/recipes-core/tasks/task-cross-canadian.bb
rename to meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 1840301..6ab4a95 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Host SDK package for cross canadian toolchain" 
-PN = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"

similarity index 80%
rename from meta/recipes-core/tasks/task-self-hosted.bb
rename to meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 4d6ab07..118ff7d 100644
@@ -9,25 +9,25 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PACKAGES = "\
-    task-self-hosted \
-    task-self-hosted-debug \
-    task-self-hosted-sdk \
-    task-self-hosted-extended \
-    task-self-hosted-graphics \
-    task-self-hosted-host-tools \
+    packagegroup-self-hosted \
+    packagegroup-self-hosted-debug \
+    packagegroup-self-hosted-sdk \
+    packagegroup-self-hosted-extended \
+    packagegroup-self-hosted-graphics \
+    packagegroup-self-hosted-host-tools \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-self-hosted = "\
-    task-self-hosted-debug \
-    task-self-hosted-sdk \
-    task-self-hosted-extended \
-    task-self-hosted-graphics \
-    task-self-hosted-host-tools \
+RDEPENDS_packagegroup-self-hosted = "\
+    packagegroup-self-hosted-debug \
+    packagegroup-self-hosted-sdk \
+    packagegroup-self-hosted-extended \
+    packagegroup-self-hosted-graphics \
+    packagegroup-self-hosted-host-tools \
     "
 
-RDEPENDS_task-self-hosted-host-tools = "\
+RDEPENDS_packagegroup-self-hosted-host-tools = "\
     connman \
     connman-plugin-ethernet \
     dhcp-client \

@@ -52,7 +52,7 @@ RDEPENDS_task-self-hosted-host-tools = "\
     "
 
 # eglibc-utils: for rpcgen
-RDEPENDS_task-self-hosted-sdk = "\
+RDEPENDS_packagegroup-self-hosted-sdk = "\
     autoconf \
     automake \
     binutils \

@@ -85,7 +85,7 @@ RDEPENDS_task-self-hosted-sdk = "\
     sed \
     "
 
-RDEPENDS_task-self-hosted-debug = " \
+RDEPENDS_packagegroup-self-hosted-debug = " \
     gdb \
     gdbserver \
     rsync \

@@ -93,7 +93,7 @@ RDEPENDS_task-self-hosted-debug = " \
     tcf-agent"
 
 
-RDEPENDS_task-self-hosted-extended = "\
+RDEPENDS_packagegroup-self-hosted-extended = "\
     bzip2 \
     chkconfig \
     chrpath \

@@ -186,7 +186,7 @@ RDEPENDS_task-self-hosted-extended = "\
     "
 
 
-RDEPENDS_task-self-hosted-graphics = "\
+RDEPENDS_packagegroup-self-hosted-graphics = "\
     builder \
     libgl \
     libgl-dev \

index f801346..9aa880e 100644
@@ -4,8 +4,8 @@ reasonably used for customization."
 IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
-    task-core-boot \
-    task-core-basic \
+    packagegroup-core-boot \
+    packagegroup-core-basic \
     "
 
 #    ${CORE_IMAGE_BASE_INSTALL} 

index 3bb7800..557259b 100644
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
-    task-core-basic \
-    task-core-lsb \
+    packagegroup-core-basic \
+    packagegroup-core-lsb \
     "
 
 inherit core-image

index 7601410..d07f90d 100644
@@ -8,8 +8,8 @@ IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
-    task-core-basic \
-    task-core-lsb \
+    packagegroup-core-basic \
+    packagegroup-core-lsb \
     kernel-dev \
     "
 

index b370d49..8435596 100644
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
-    task-core-basic \
-    task-core-lsb \
+    packagegroup-core-basic \
+    packagegroup-core-lsb \
     "
 
 inherit core-image

index b4e7ab0..26c7307 100644
@@ -5,7 +5,7 @@ Configure distro version package
 We need to configure a package that the system can use to determine the
 system distribution version.
 
-Hack: for now set to task-core-rpm.
+Hack: for now set to packagegroup-core-rpm.
 
 Signed-off-by: Mark Hatle <[email protected]>
 

@@ -17,7 +17,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
  
    std::string ZConfig::distroverpkg() const
 -  { return "redhat-release"; }
-+  { return "task-core-rpm"; }
++  { return "packagegroup-core-rpm"; }
  
    ///////////////////////////////////////////////////////////////////
  

147 lines not on this page · raw message

159 lines not on this page · raw message

similarity index 87%
rename from meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
rename to meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 29a4f56..a00ca36 100644
@@ -10,12 +10,12 @@ PR = "r12"
 
 ALLOW_EMPTY = "1"
 
-require task-sdk-gmae.inc
+require packagegroup-sdk-gmae.inc
 
 PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
-    task-core-sdk \
+    packagegroup-core-sdk \
     libglade-dev \
     ${SDK-GMAE} \
     ${SDK-EXTRAS}"

similarity index 85%
rename from meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
rename to meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 45b502f..3b2abdd 100644
@@ -10,12 +10,12 @@ PR = "r14"
 
 ALLOW_EMPTY = "1"
 
-require task-sdk-gmae.inc
+require packagegroup-sdk-gmae.inc
 
 PACKAGES = "${PN} ${PN}-dbg"
 
 RDEPENDS_${PN} = "\
-    task-core-standalone-sdk-target \
+    packagegroup-core-standalone-sdk-target \
     libglade-dev \
     ${SDK-GMAE} \
     ${SDK-EXTRAS}"

similarity index 100%
rename from meta/recipes-gnome/tasks/task-sdk-gmae.inc
rename to meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc

index aa6e2a2..4c5adee 100644
@@ -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

index dcf5165..868b309 100644
@@ -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 () {

similarity index 49%
rename from meta/recipes-graphics/tasks/task-core-clutter.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 4044131..039f5c6 100644
@@ -10,28 +10,28 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 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 \
+    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_task-core-clutter-core = "\
+RDEPENDS_packagegroup-core-clutter-core = "\
     clutter-1.8 \
     clutter-gst-1.8 \
     clutter-gtk-1.8 \
     "
 
-#RDEPENDS_task-core-clutter-tests = "\
+#RDEPENDS_packagegroup-core-clutter-tests = "\
 #    clutter-gst-1.8-examples \
 #    clutter-gtk-1.8-examples"
 
-#RDEPENDS_task-core-clutter-apps = "\
+#RDEPENDS_packagegroup-core-clutter-apps = "\
 #    clutter-box2d "

similarity index 96%
rename from meta/recipes-graphics/tasks/task-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 239e0c1..8609013 100644
@@ -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)}'
 

index 8f9478d..205c912 100644
@@ -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

index 116db91..20dd354 100644
@@ -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

similarity index 64%
rename from meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
rename to meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 5098d11..1c53a9c 100644
@@ -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"

similarity index 72%
rename from meta/recipes-qt/tasks/task-core-qt.bb
rename to meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 69512a4..4fe07c6 100644
@@ -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}"

similarity index 98%
rename from meta/recipes-qt/tasks/task-qt4e.bb
rename to meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index c95c898..4b6d6a7 100644
@@ -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)}'
 

similarity index 95%
rename from meta/recipes-qt/tasks/task-qte-toolchain-target.bb
rename to meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index 7ee575f..abd6a1f 100644
@@ -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 \

similarity index 85%
rename from meta/recipes-sato/tasks/task-core-x11-mini.bb
rename to meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
index 0aed286..4f3bb47 100644
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r1"
 
 PACKAGES = "\
-    task-core-x11-mini \
-    task-core-x11-mini-dbg \
-    task-core-x11-mini-dev \
+    packagegroup-core-x11-mini \
+    packagegroup-core-x11-mini-dbg \
+    packagegroup-core-x11-mini-dev \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
 VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
 
-RDEPENDS_task-core-x11-mini = "\
+RDEPENDS_packagegroup-core-x11-mini = "\
     dbus \
     pointercal \
     matchbox-terminal \

similarity index 83%
rename from meta/recipes-sato/tasks/task-core-x11-sato.bb
rename to meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index cf294b3..380584e 100644
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r32"
 
 PACKAGES = "\
-    task-core-x11-sato \
-    task-core-x11-sato-dbg \
-    task-core-x11-sato-dev \
+    packagegroup-core-x11-sato \
+    packagegroup-core-x11-sato-dbg \
+    packagegroup-core-x11-sato-dev \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -24,7 +24,7 @@ NETWORK_MANAGER_libc-uclibc = ""
 WEB ?= ""
 #WEB = "web-webkit"
 
-RDEPENDS_task-core-x11-sato = "\
+RDEPENDS_packagegroup-core-x11-sato = "\
     matchbox-desktop \
     matchbox-session-sato \
     matchbox-keyboard \

similarity index 70%
rename from meta/recipes-sato/tasks/task-core-x11.bb
rename to meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
index 764ea02..4c16c46 100644
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r36"
 
 PACKAGES = "\
-    task-core-apps-x11-core \
-    task-core-apps-x11-core-dbg \
-    task-core-apps-x11-core-dev \
-    task-core-apps-x11-games \
-    task-core-apps-x11-games-dbg \
-    task-core-apps-x11-games-dev \
-    task-core-x11-base \
-    task-core-x11-base-dbg \
-    task-core-x11-base-dev \
+    packagegroup-core-apps-x11-core \
+    packagegroup-core-apps-x11-core-dbg \
+    packagegroup-core-apps-x11-core-dev \
+    packagegroup-core-apps-x11-games \
+    packagegroup-core-apps-x11-games-dbg \
+    packagegroup-core-apps-x11-games-dev \
+    packagegroup-core-x11-base \
+    packagegroup-core-x11-base-dbg \
+    packagegroup-core-x11-base-dev \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -37,7 +37,7 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
 VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
 
-RDEPENDS_task-core-x11-base = "\
+RDEPENDS_packagegroup-core-x11-base = "\
     dbus \
     pointercal \
     matchbox-wm \

@@ -57,12 +57,12 @@ RDEPENDS_task-core-x11-base = "\
     xrandr"
 
 
-RDEPENDS_task-core-apps-x11-core = "\
+RDEPENDS_packagegroup-core-apps-x11-core = "\
     leafpad \
     ${FILEMANAGER} \
     matchbox-terminal \
     sato-screenshot"
 
 
-RDEPENDS_task-core-apps-x11-games = "\
+RDEPENDS_packagegroup-core-apps-x11-games = "\
     oh-puzzles"

index 5b66f03..a2c4586 100755
@@ -42,7 +42,7 @@ for pkg in `bitbake -s | awk '{ print \$1 }'`; do
 		# Skip native/nativesdk/cross-canadian recipes
 		continue
 	fi
-	if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^task- || "$pkg" =~ -image ]]; then
+	if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^packagegroup- || "$pkg" =~ -image ]]; then
 		# Skip meta, task and image recipes
 		continue
 	fi

index ea894b2..85acd1f 100644
@@ -23,16 +23,10 @@ PACKAGES = ' \
             ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
             ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \
-            ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \
             \
-            ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \
-            ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \
-	    \
             ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \

@@ -42,7 +36,6 @@ PACKAGES = ' \
             ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \
-            ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \
             ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \
             \
             '

@@ -55,12 +48,6 @@ ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #
-# those ones can be set in machine config to supply packages needed to get machine booting
-#
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-
-#
 # packagegroup-base contain stuff needed for base system (machine related)
 #
 RDEPENDS_packagegroup-base = "\

@@ -85,9 +72,6 @@ RDEPENDS_packagegroup-base = "\
     ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
     ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \
     \
     ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \

@@ -95,7 +79,6 @@ RDEPENDS_packagegroup-base = "\
     ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
     "
 

@@ -128,13 +111,13 @@ python __anonymous () {
     machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
 
     if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
-	d.setVar("ADD_BT", "packagegroup-base-bluetooth")
+        d.setVar("ADD_BT", "packagegroup-base-bluetooth")
 
     if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
-	d.setVar("ADD_WIFI", "packagegroup-base-wifi")
+        d.setVar("ADD_WIFI", "packagegroup-base-wifi")
 
     if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
-	d.setVar("ADD_3G", "packagegroup-base-3g")
+        d.setVar("ADD_3G", "packagegroup-base-3g")
 }
 
 #

@@ -188,8 +171,6 @@ RRECOMMENDS_packagegroup-base-alsa = "\
 RDEPENDS_packagegroup-base-pcmcia = "\
     pcmciautils \
     "
-#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
-#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
 
 
 RRECOMMENDS_packagegroup-base-pcmcia = "\

@@ -203,8 +184,6 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
-# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
-
 RDEPENDS_packagegroup-base-bluetooth = "\
     bluez4 \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \

@@ -333,18 +312,6 @@ RRECOMMENDS_packagegroup-base-nfs = "\
 RDEPENDS_packagegroup-base-zeroconf = "\
     avahi-daemon"
 
-RDEPENDS_packagegroup-base-raid = "\
-	"
-
-RDEPENDS_packagegroup-base-screen = "\
-	"
-
-#
-# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
-#
-RDEPENDS_packagegroup-base-touchscreen = "\
-    "
-
 RDEPENDS_packagegroup-base-ipv6 = "\
     "
 

index 6ec154a..aa9e0ac 100644
@@ -1,16 +1,18 @@
-# Task packages are only used to pull in other packages
+# Class for packagegroup (package group) recipes
+
+# packagegroup packages are only used to pull in other packages
 # via their dependencies. They are empty.
 ALLOW_EMPTY = "1"
 
-# By default, only the task package itself is in PACKAGES.
+# By default, only the packagegroup package itself is in PACKAGES.
 # -dbg and -dev flavours are handled by the anonfunc below.
-# This means that task recipes used to build multiple task
-# packages have to modify PACKAGES after inheriting task.bbclass.
+# This means that packagegroup recipes used to build multiple packagegroup
+# packages have to modify PACKAGES after inheriting packagegroup.bbclass.
 PACKAGES = "${PN}"
 
-# By default, task packages do not depend on a certain architecture.
+# By default, packagegroup packages do not depend on a certain architecture.
 # Only if dependencies are modified by MACHINE_FEATURES, packages
-# need to be set to MACHINE_ARCH after inheriting task.bbclass
+# need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass
 PACKAGE_ARCH = "all"
 
 # This automatically adds -dbg and -dev flavours of all PACKAGES

index e63753b..4b1059c 100644
@@ -20,9 +20,3 @@ RDEPENDS_packagegroup-core-nfs-server = "\
     nfs-utils \
     nfs-utils-client \
     "
-
-# rpcinfo can be useful but only with glibc images
-GLIBC_DEPENDENCIES = "glibc-utils"
-
-RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
-

index aa9e0ac..2e07529 100644
@@ -19,6 +19,9 @@ PACKAGE_ARCH = "all"
 # to the list. Their dependencies (RRECOMMENDS) are handled as usual
 # by package_depchains in a following step.
 python () {
+    if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
+        return
+
     packages = d.getVar('PACKAGES', True).split()
     genpackages = []
     for pkg in packages:

index ea054bc..ef05004 100644
@@ -5,14 +5,13 @@
 DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
 PR = "r11"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-inherit nativesdk
+inherit nativesdk packagegroup
 
-PACKAGES = "${PN}"
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} = "\
     nativesdk-pkgconfig \

index 85acd1f..7e2bd69 100644
@@ -40,8 +40,6 @@ PACKAGES = ' \
             \
             '
 
-ALLOW_EMPTY = "1"
-
 #
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #

index 7e80fff..b49fb3f 100644
@@ -6,11 +6,13 @@ DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
 PR = "r9"
 
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 #
 # Set by the machine configuration with packages essential for device bootup
 #

@@ -24,13 +26,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
 VIRTUAL-RUNTIME_initscripts ?= "initscripts"
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 
-PACKAGES = "\
-    packagegroup-core-boot \
-    packagegroup-core-boot-dbg \
-    packagegroup-core-boot-dev \
-"
-
-RDEPENDS_packagegroup-core-boot = "\
+RDEPENDS_${PN} = "\
     base-files \
     base-passwd \
     busybox \

@@ -45,5 +41,5 @@ RDEPENDS_packagegroup-core-boot = "\
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
-RRECOMMENDS_packagegroup-core-boot = "\
+RRECOMMENDS_${PN} = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"

index fd8eb25..63003d0 100644
@@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r35"
 
-PACKAGES = "\
-    packagegroup-core-apps-console \
-    packagegroup-core-apps-console-dbg \
-    packagegroup-core-apps-console-dev \
-    "
+inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-ALLOW_EMPTY = "1"
-
 SPLASH ?= "psplash"
 
 RDEPENDS_packagegroup-core-apps-console = "\

index 4b1059c..8b2318e 100644
@@ -8,15 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r1"
 
-PACKAGES = "\
-    packagegroup-core-nfs-server \
-    packagegroup-core-nfs-server-dbg \
-    packagegroup-core-nfs-server-dev \
-    "
+inherit packagegroup
 
-ALLOW_EMPTY = "1"
+PACKAGES = "${PN}-server"
 
-RDEPENDS_packagegroup-core-nfs-server = "\
+RDEPENDS_${PN}-server = "\
     nfs-utils \
     nfs-utils-client \
     "

index 663f705..4ee802f 100644
@@ -9,13 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 DEPENDS = "packagegroup-core-console"
 PR = "r8"
 
-ALLOW_EMPTY = "1"
-#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
+inherit packagegroup
 
-PACKAGES = "\
-    packagegroup-core-sdk \
-    packagegroup-core-sdk-dbg \
-    packagegroup-core-sdk-dev"
+#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
 RDEPENDS_packagegroup-core-sdk = "\
     autoconf \

index 9dcc342..a07e2ba 100644
@@ -4,14 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
-PACKAGES = "\
-    packagegroup-core-ssh-dropbear \
-    packagegroup-core-ssh-dropbear-dbg \
-    packagegroup-core-ssh-dropbear-dev \
-    "
+inherit packagegroup
 
-ALLOW_EMPTY = "1"
-
-RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear"
-RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg"
-RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev"
+RDEPENDS_${PN} = "dropbear"

index 7e85b29..89f8c93 100644
@@ -4,14 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
-PACKAGES = "\
-    packagegroup-core-ssh-openssh \
-    packagegroup-core-ssh-openssh-dbg \
-    packagegroup-core-ssh-openssh-dev \
-    "
+inherit packagegroup
 
-ALLOW_EMPTY = "1"
-
-RDEPENDS_packagegroup-core-ssh-openssh = "openssh"
-RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg"
-RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev"
+RDEPENDS_${PN} = "openssh"

index 03628a1..4099d45 100644
@@ -3,9 +3,10 @@ PR = "r7"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY = "1"
 
-PACKAGES = "${PN} ${PN}-dbg"
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} = "\
     libgcc \

index b7eff21..be424a3 100644
@@ -7,18 +7,12 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PACKAGES = "\
-    ${PN} \
-    ${PN}-dbg \
-    ${PN}-dev \
-    "
+inherit packagegroup
 
 PR = "r1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-ALLOW_EMPTY = "1"
-
 MTRACE = ""
 MTRACE_libc-glibc = "libc-mtrace"
 

index 30776ef..24a99c7 100644
@@ -7,16 +7,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PACKAGES = "\
-    ${PN} \
-    ${PN}-dbg \
-    ${PN}-dev \
-    "
+inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-ALLOW_EMPTY = "1"
-
 RRECOMMENDS_${PN} = "\
     perf \
     trace-cmd \

index bdd0d05..52c278a 100644
@@ -7,16 +7,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PACKAGES = "\
-    ${PN} \
-    ${PN}-dbg \
-    ${PN}-dev \
-    "
+inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-ALLOW_EMPTY = "1"
-
 # kexec-tools doesn't work on Mips
 KEXECTOOLS ?= "kexec"
 KEXECTOOLS_mips ?= ""

index 6ab4a95..8870ccc 100644
@@ -2,13 +2,13 @@ DESCRIPTION = "Host SDK package for cross canadian toolchain"
 PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 PR = "r0"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-inherit cross-canadian
 
-PACKAGES = "${PN}"
+inherit cross-canadian packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} = "\
     binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \

index 118ff7d..7567457 100644
@@ -8,6 +8,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
+inherit packagegroup
+
 PACKAGES = "\
     packagegroup-self-hosted \
     packagegroup-self-hosted-debug \

@@ -17,8 +19,6 @@ PACKAGES = "\
     packagegroup-self-hosted-host-tools \
     "
 
-ALLOW_EMPTY = "1"
-
 RDEPENDS_packagegroup-self-hosted = "\
     packagegroup-self-hosted-debug \
     packagegroup-self-hosted-sdk \

index a7e3eb7..95edd78 100644
@@ -8,38 +8,21 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
+inherit packagegroup
+
 PACKAGES = "\
     packagegroup-core-basic \
     packagegroup-core-base-utils \
-    packagegroup-core-base-utils-dbg \
-    packagegroup-core-base-utils-dev \
     packagegroup-core-basic-libs \
-    packagegroup-core-basic-libs-dbg \
-    packagegroup-core-basic-libs-dev \
     packagegroup-core-basic-utils \
-    packagegroup-core-basic-utils-dbg \
-    packagegroup-core-basic-utils-dev \
     packagegroup-core-basic-extended \
-    packagegroup-core-basic-extended-dbg \
-    packagegroup-core-basic-extended-dev \
     packagegroup-core-dev-utils \
-    packagegroup-core-dev-utils-dbg \
-    packagegroup-core-dev-utils-dev \
     packagegroup-core-multiuser \
-    packagegroup-core-multiuser-dbg \
-    packagegroup-core-multiuser-dev \
     packagegroup-core-initscripts \
-    packagegroup-core-initscripts-dbg \
-    packagegroup-core-initscripts-dev \
     packagegroup-core-rpm \
-    packagegroup-core-rpm-dbg \
-    packagegroup-core-rpm-dev \
     packagegroup-core-sys-services \
-    packagegroup-core-sys-services-dbg \
-    packagegroup-core-sys-services-dev \
     "
 
-ALLOW_EMPTY = "1"
 
 RDEPENDS_packagegroup-core-basic = "\
     packagegroup-core-base-utils \

index 984ed36..558db00 100644
@@ -8,26 +8,16 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
+inherit packagegroup
+
 PACKAGES = "\
     packagegroup-core-lsb \
     packagegroup-core-sys-extended \
-    packagegroup-core-sys-extended-dbg \
-    packagegroup-core-sys-extended-dev \
     packagegroup-core-db \
-    packagegroup-core-db-dbg \
-    packagegroup-core-db-dev \
     packagegroup-core-misc \
-    packagegroup-core-misc-dbg \
-    packagegroup-core-misc-dev \
     packagegroup-core-perl \
-    packagegroup-core-perl-dbg \
-    packagegroup-core-perl-dev \
     packagegroup-core-python \
-    packagegroup-core-python-dbg \
-    packagegroup-core-python-dev \
     packagegroup-core-tcl \
-    packagegroup-core-tcl-dbg \
-    packagegroup-core-tcl-dev \
     packagegroup-core-lsb-perl-add \
     packagegroup-core-lsb-python-add \
     packagegroup-core-lsb-graphic-add \

@@ -36,8 +26,6 @@ PACKAGES = "\
     "
 
 
-ALLOW_EMPTY = "1"
-
 RDEPENDS_packagegroup-core-lsb = "\
     packagegroup-core-sys-extended \
     packagegroup-core-db \

index a00ca36..45cffa4 100644
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r12"
 
-ALLOW_EMPTY = "1"
+inherit packagegroup
 
 require packagegroup-sdk-gmae.inc
 
-PACKAGES = "${PN}"
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-sdk \

index 3b2abdd..79b3253 100644
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r14"
 
-ALLOW_EMPTY = "1"
+inherit packagegroup
 
 require packagegroup-sdk-gmae.inc
 
-PACKAGES = "${PN} ${PN}-dbg"
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-standalone-sdk-target \

index 039f5c6..d6ac4f3 100644
@@ -9,20 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r4"
 
+inherit packagegroup
+
 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 \

index 8609013..0c47b6f 100644
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+PACKAGES = "${PN}-base"
 
-PACKAGES += " \
-	${PN}-base \
-"
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN}-base = " \
 		directfb \

index 1c53a9c..a3c275f 100644
@@ -2,6 +2,5 @@ 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"

index 4fe07c6..ec5e94b 100644
@@ -8,15 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r3"
 
-PACKAGES = "\
-    packagegroup-core-qt-demos \
-    packagegroup-core-qt-demos-dbg \
-    packagegroup-core-qt-demos-dev \
-    "
+inherit packagegroup
 
-ALLOW_EMPTY = "1"
+PACKAGES = "${PN}-demos"
 
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
-#QTDEMOS_disabled = "fotowall"
 
-RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}"
+RDEPENDS_${PN}-demos = "${QTDEMOS}"

index 4b6d6a7..2ee7959 100644
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+PACKAGES = "${PN}-base"
 
-PACKAGES += " \
-	${PN}-base \
-"
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN}-base = " \
 	qt4-embedded \

index abd6a1f..61466d9 100644
@@ -1,12 +1,15 @@
 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"
 
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
 RDEPENDS_${PN} += " \
         packagegroup-core-standalone-sdk-target \
         qt4-embedded-mkspecs \

index 4f3bb47..432d99d 100644
@@ -8,18 +8,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r1"
 
-PACKAGES = "\
-    packagegroup-core-x11-mini \
-    packagegroup-core-x11-mini-dbg \
-    packagegroup-core-x11-mini-dev \
-    "
+inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 
-ALLOW_EMPTY = "1"
-
 ROOTLESS_X = "1"
 
 # xserver-common, x11-common

index 380584e..f38e0d2 100644
@@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r32"
 
-PACKAGES = "\
-    packagegroup-core-x11-sato \
-    packagegroup-core-x11-sato-dbg \
-    packagegroup-core-x11-sato-dev \
-    "
+inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-ALLOW_EMPTY = "1"
-
 NETWORK_MANAGER ?= "connman-gnome"
 NETWORK_MANAGER_libc-uclibc = ""
 

index 4c16c46..3fe5cae 100644
@@ -8,24 +8,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r36"
 
+inherit packagegroup
+
 PACKAGES = "\
     packagegroup-core-apps-x11-core \
-    packagegroup-core-apps-x11-core-dbg \
-    packagegroup-core-apps-x11-core-dev \
     packagegroup-core-apps-x11-games \
-    packagegroup-core-apps-x11-games-dbg \
-    packagegroup-core-apps-x11-games-dev \
     packagegroup-core-x11-base \
-    packagegroup-core-x11-base-dbg \
-    packagegroup-core-x11-base-dev \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 
-ALLOW_EMPTY = "1"
-
 # pcmanfm doesn't work on mips/powerpc
 FILEMANAGER ?= "pcmanfm"
 FILEMANAGER_mips ?= ""

index a85a9ea..f748552 100644
@@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # - x11-mini            - minimal environment for X11 server 
 # - x11-base            - X11 server + minimal desktop	
 # - x11-sato            - OpenedHand Sato environment
-# - apps-x11-core       - X Terminal, file manager, file editor
-# - apps-x11-games
 # - tools-sdk           - SDK
 # - tools-debug         - debugging tools
 # - tools-profile       - profiling tools

@@ -31,8 +29,6 @@ PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
 PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
 PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
 PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
-PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
-PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
 PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
 PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
 PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"

index ea6ba7e..73a707d 100644
@@ -1,7 +1,6 @@
-DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
-and file manager."
+DESCRIPTION = "A very basic X11 image with a terminal"
 
-IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
+IMAGE_FEATURES += "apps-console-core package-management x11-base"
 
 LICENSE = "MIT"
 

index 4c5adee..84ceb27 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
 which enables development of rich and animated graphical user interfaces."
 
-IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 

index 4bbf099..76f9081 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
 mobile devices. The image supports X11 with a Sato theme, Pimlico \
 applications, and contains terminal, editor, and file manager."
 
-IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 

index f38e0d2..b31eaba 100644
@@ -12,25 +12,51 @@ inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
+
+RDEPENDS_${PN} = "\
+    ${PN}-base \
+    ${PN}-apps \
+    ${PN}-games \
+    "
+
 NETWORK_MANAGER ?= "connman-gnome"
 NETWORK_MANAGER_libc-uclibc = ""
 
-WEB ?= ""
-#WEB = "web-webkit"
-
-RDEPENDS_packagegroup-core-x11-sato = "\
+RDEPENDS_${PN}-base = "\
     matchbox-desktop \
     matchbox-session-sato \
     matchbox-keyboard \
+    matchbox-keyboard-applet \
+    matchbox-keyboard-im \
     matchbox-stroke \
     matchbox-config-gtk \
     xcursor-transparent-theme \
     sato-icon-theme \
     settings-daemon \
     gtk-sato-engine \
-    gthumb \
-    x11vnc \
     libsdl \
+    ${NETWORK_MANAGER} \
+    "
+
+# pcmanfm doesn't work on mips
+FILEMANAGER ?= "pcmanfm"
+FILEMANAGER_mips ?= ""
+
+WEB ?= ""
+#WEB = "web-webkit"
+
+RDEPENDS_${PN}-apps = "\
+    gthumb \
+    leafpad \
     gaku \
+    x11vnc \
+    matchbox-terminal \
+    sato-screenshot \
+    ${FILEMANAGER} \
     ${WEB} \
-    ${NETWORK_MANAGER}"
+    "
+
+RDEPENDS_${PN}-games = "\
+    oh-puzzles \
+    "

index 3fe5cae..b69cc50 100644
@@ -11,8 +11,6 @@ PR = "r36"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-core-apps-x11-core \
-    packagegroup-core-apps-x11-games \
     packagegroup-core-x11-base \
     "
 

@@ -20,10 +18,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 
-# pcmanfm doesn't work on mips/powerpc
-FILEMANAGER ?= "pcmanfm"
-FILEMANAGER_mips ?= ""
-
 # xserver-common, x11-common
 VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
 

@@ -49,14 +43,3 @@ RDEPENDS_packagegroup-core-x11-base = "\
     xhost \
     xset \
     xrandr"
-
-
-RDEPENDS_packagegroup-core-apps-x11-core = "\
-    leafpad \
-    ${FILEMANAGER} \
-    matchbox-terminal \
-    sato-screenshot"
-
-
-RDEPENDS_packagegroup-core-apps-x11-games = "\
-    oh-puzzles"

similarity index 100%
rename from meta/recipes-core/images/core-image-core.bb
rename to meta/recipes-graphics/images/core-image-x11.bb

index f748552..a23d3c8 100644
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # Available IMAGE_FEATURES:
 #
 # - apps-console-core
-# - x11-mini            - minimal environment for X11 server 
-# - x11-base            - X11 server + minimal desktop	
+# - x11                 - X server
+# - x11-base            - X server with minimal environment
 # - x11-sato            - OpenedHand Sato environment
 # - tools-sdk           - SDK
 # - tools-debug         - debugging tools

@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # - debug-tweaks        - makes an image suitable for development
 #
 PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
-PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
+PACKAGE_GROUP_x11 = "packagegroup-core-x11"
 PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
 PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
 PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"

index a86daa5..09b0361 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r15"
 
-IMAGE_FEATURES += "x11-mini package-management"
+IMAGE_FEATURES += "x11-base package-management"
 
 # Ensure there's enough space to do a core-image-sato build, with rm_work enabled
 IMAGE_ROOTFS_EXTRA_SPACE = "41943040"

new file mode 100644
index 0000000..eb4b27d
@@ -0,0 +1,18 @@
+DESCRIPTION = "Tasks for core X11 applications"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r0"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = "\
+    packagegroup-core-x11-xserver \
+    packagegroup-core-x11-utils \
+    dbus \
+    pointercal \
+    matchbox-terminal \
+    matchbox-wm \
+    mini-x-session \
+    liberation-fonts \
+    "

similarity index 78%
rename from meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 432d99d..9563de0 100644
@@ -6,15 +6,15 @@ DESCRIPTION = "Tasks for core X11 applications"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r1"
+PR = "r36"
 
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
+PACKAGES = "${PN} ${PN}-xserver ${PN}-utils"
 
-ROOTLESS_X = "1"
+XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 
 # xserver-common, x11-common
 VIRTUAL-RUNTIME_xserver_common ?= "x11-common"

@@ -22,18 +22,20 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
 # elsa, xserver-nodm-init
 VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
+RDEPENDS_${PN} = "\
+    ${PN}-xserver \
+    ${PN}-utils \
+    "
 
-RDEPENDS_packagegroup-core-x11-mini = "\
-    dbus \
-    pointercal \
-    matchbox-terminal \
-    matchbox-wm \
-    mini-x-session \
+RDEPENDS_${PN}-xserver = "\
     ${XSERVER} \
+    "
+
+RDEPENDS_${PN}-utils = "\
     ${VIRTUAL-RUNTIME_xserver_common} \
     ${VIRTUAL-RUNTIME_graphical_init_manager} \
-    liberation-fonts \
     xauth \
     xhost \
     xset \
-    xrandr"
+    xrandr \
+    "

index 76f9081..6b6c761 100644
@@ -7,3 +7,5 @@ IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-se
 LICENSE = "MIT"
 
 inherit core-image
+
+IMAGE_INSTALL += "packagegroup-core-x11-sato-games"

45 lines not on this page · raw message

index 205c912..9e8b337 100644
@@ -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

similarity index 94%
rename from meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
rename to meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 2ee7959..2ea9c2e 100644
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-PACKAGES = "${PN}-base"
-
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
-RDEPENDS_${PN}-base = " \
+RDEPENDS_${PN} = " \
 	qt4-embedded \
 	libqt-embedded3support4 \
 	libqt-embeddedclucene4 \

@@ -48,7 +46,7 @@ RDEPENDS_${PN}-base = " \
         qt4-embedded-assistant \
 "
 
-RRECOMMENDS_${PN}-base = " \
+RRECOMMENDS_${PN} = " \
 	libqt-embeddedxmlpatterns4 \
 "
 

index 868b309..05f03cd 100644
@@ -6,18 +6,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 
-DEPENDS += "packagegroup-core-gtk-directfb"
-
-RDEPENDS_${PN} += " \
-	packagegroup-core-gtk-directfb-base \
-	"
-
 inherit core-image
 
 IMAGE_INSTALL += "\
 	${CORE_IMAGE_BASE_INSTALL} \
 	packagegroup-core-basic \
-	packagegroup-core-gtk-directfb-base \
+	packagegroup-core-gtk-directfb \
 "
 
 python __anonymous () {

index 0c47b6f..2f35b34 100644
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-PACKAGES = "${PN}-base"
-
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
-RDEPENDS_${PN}-base = " \
+RDEPENDS_${PN} = " \
 		directfb \
 		directfb-examples \
 		pango \

index 7e2bd69..c0f0f52 100644
@@ -255,7 +255,7 @@ RRECOMMENDS_packagegroup-base-ppp = "\
     kernel-module-slhc"
 
 RDEPENDS_packagegroup-base-ipsec = "\
-    openswan"
+    "
 
 RRECOMMENDS_packagegroup-base-ipsec = "\
     kernel-module-ipsec"

index 2f35b34..19eea99 100644
@@ -17,6 +17,5 @@ RDEPENDS_${PN} = " \
 		fontconfig \
 		gtk+ \
 		gtk-demo \
-		dropbear \
 		${TOUCH} \
 "

index 2e07529..f6b7d2d 100644
@@ -33,3 +33,12 @@ python () {
 # We don't want to look at shared library dependencies for the
 # dbg packages
 DEPCHAIN_DBGDEFAULTDEPS = "1"
+
+# We only need the packaging tasks - disable the rest
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_populate_sysroot[noexec] = "1"

index ef05004..39bb594 100644
@@ -6,9 +6,6 @@ DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
 PR = "r11"
 LICENSE = "MIT"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
 inherit nativesdk packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

index c0f0f52..46db72d 100644
@@ -1,7 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r75"
 
 inherit packagegroup

index b49fb3f..a2970d9 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 PR = "r9"
 

index 63003d0..0c5e7f1 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Tasks for core console applications"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r35"
 
 inherit packagegroup

index 8b2318e..7b9abdd 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "NFS tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r1"
 
 inherit packagegroup

index 4ee802f..8d7bbac 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "packagegroup-core-console"
 PR = "r8"
 

index a07e2ba..dd47d0c 100644
@@ -1,7 +1,5 @@
 DESCRIPTION = "Dropbear SSH task for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 inherit packagegroup

index 89f8c93..8a61b4f 100644
@@ -1,7 +1,5 @@
 DESCRIPTION = "OpenSSH SSH task for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 inherit packagegroup

index 4099d45..078e7dd 100644
@@ -1,8 +1,6 @@
 DESCRIPTION = "Target packages for the standalone SDK"
 PR = "r7"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index be424a3..06903a4 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Debug tools tasks for OE-Core"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index 24a99c7..bdf0d74 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Profile tools tasks for OE-Core"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index 52c278a..500f119 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Test apps task for OE-Core"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index 8870ccc..fcae851 100644
@@ -3,9 +3,6 @@ PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 PR = "r0"
 LICENSE = "MIT"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
 inherit cross-canadian packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

index 7567457..67e3f3c 100644
@@ -5,8 +5,6 @@
 DESCRIPTION = "Create Basic Image Tasks"
 PR = "r11"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index 95edd78..b2489fe 100644
@@ -5,8 +5,6 @@
 DESCRIPTION = "Create Basic Image Tasks"
 PR = "r4"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index 558db00..0e3998d 100644
@@ -5,8 +5,6 @@
 DESCRIPTION = "Create Small Image Tasks"
 PR = "r9"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit packagegroup
 

index 45cffa4..782df1f 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r12"
 
 inherit packagegroup

index 79b3253..c560049 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r14"
 
 inherit packagegroup

index d6ac4f3..b928096 100644
@@ -4,8 +4,6 @@
 
 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"
 

index 19eea99..df22cd5 100644
@@ -2,9 +2,6 @@ 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)}'

index eb4b27d..1f17f01 100644
@@ -1,7 +1,5 @@
 DESCRIPTION = "Tasks for core X11 applications"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 inherit packagegroup

index 9563de0..7099c70 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Tasks for core X11 applications"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r36"
 
 inherit packagegroup

index ec5e94b..579ca15 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Qt Tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r3"
 
 inherit packagegroup

index 2ea9c2e..de8341b 100644
@@ -2,9 +2,6 @@ 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)}'

index 61466d9..7b65bcc 100644
@@ -3,9 +3,6 @@ LICENSE = "MIT"
 
 PR = "r5"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
 inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

index b31eaba..ebd2df1 100644
@@ -4,8 +4,6 @@
 
 DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r32"
 
 inherit packagegroup

index 84ceb27..496246e 100644
@@ -8,7 +8,6 @@ LICENSE = "MIT"
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
     packagegroup-core-clutter-core \
-    packagegroup-core-clutter-tests \
-    packagegroup-core-clutter-apps"
+    "
 
 inherit core-image

index b928096..2c62820 100644
@@ -10,20 +10,11 @@ PR = "r4"
 inherit packagegroup
 
 PACKAGES = "\
-    packagegroup-core-clutter-core \
-    packagegroup-core-clutter-apps \
-    packagegroup-core-clutter-tests \
+    ${PN}-core \
     "
 
-RDEPENDS_packagegroup-core-clutter-core = "\
+RDEPENDS_${PN}-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 "

index a23d3c8..6a391d5 100644
@@ -37,7 +37,7 @@ PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
 PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
 PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
 PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
-PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos"
+PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps"
 
 
 # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'

index 579ca15..d59cb4b 100644
@@ -8,8 +8,8 @@ PR = "r3"
 
 inherit packagegroup
 
-PACKAGES = "${PN}-demos"
+PACKAGES = "${PN}-demoapps"
 
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
 
-RDEPENDS_${PN}-demos = "${QTDEMOS}"
+RDEPENDS_${PN}-demoapps = "${QTDEMOS}"

index 6a391d5..2bfadb4 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 #
 # Available IMAGE_FEATURES:
 #
-# - apps-console-core
 # - x11                 - X server
 # - x11-base            - X server with minimal environment
 # - x11-sato            - OpenedHand Sato environment

@@ -25,7 +24,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # - ssh-server-openssh  - SSH server (openssh)
 # - debug-tweaks        - makes an image suitable for development
 #
-PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
 PACKAGE_GROUP_x11 = "packagegroup-core-x11"
 PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
 PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"

@@ -47,6 +45,14 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
 # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2'
 # An error exception would be raised if both image features foo and bar1(or bar2) are included
 
+python __anonymous() {
+    # Ensure we still have a splash screen for existing images
+    if base_contains("IMAGE_FEATURES", "apps-console-core", "1", "", d) == "1":
+        bb.warn("%s: apps-console-core in IMAGE_FEATURES is no longer supported; adding \"splash\" to enable splash screen" % d.getVar("PN", True))
+        d.appendVar("IMAGE_FEATURES", " splash")
+}
+
+
 CORE_IMAGE_BASE_INSTALL = '\
     packagegroup-core-boot \
     packagegroup-base-extended \

index 0f6ab38..2e95556 100644
@@ -39,6 +39,10 @@ def normal_groups(d):
     features = set(oe.data.typed_value('IMAGE_FEATURES', d))
     return features.difference(extras)
 
+# Define some very basic feature package groups
+SPLASH ?= "psplash"
+PACKAGE_GROUP_splash = "${SPLASH}"
+
 # Wildcards specifying complementary packages to install for every package that has been explicitly
 # installed into the rootfs
 def complementary_globs(featurevar, d):

index 30c8dd1..8ef3376 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "A console-only image that fully supports the target device \
 hardware."
 
-IMAGE_FEATURES += "apps-console-core"
+IMAGE_FEATURES += "splash"
 
 LICENSE = "MIT"
 

deleted file mode 100644
index 0c5e7f1..0000000
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2011 Intel Corporation
-#
-
-DESCRIPTION = "Tasks for core console applications"
-LICENSE = "MIT"
-PR = "r35"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SPLASH ?= "psplash"
-
-RDEPENDS_packagegroup-core-apps-console = "\
-    avahi-daemon \
-    dbus \
-    portmap \
-    ${SPLASH}"
-

index 8d7bbac..e944ec5 100644
@@ -4,7 +4,6 @@
 
 DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
 LICENSE = "MIT"
-DEPENDS = "packagegroup-core-console"
 PR = "r8"
 
 inherit packagegroup

index 9aa880e..06f15a8 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "A foundational basic image without support for X that can be \
 reasonably used for customization."
 
-IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
+IMAGE_FEATURES += "splash ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     packagegroup-core-boot \

index 557259b..013efb9 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for development work. It \
 can be used for customization and implementations that conform to Linux \
 Standard Base (LSB)."
 
-IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
+IMAGE_FEATURES += "splash dev-pkgs ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \

index d07f90d..abddb76 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \
 (LSB) implementations. It includes the full meta-toolchain, plus development \
 headers and libraries to form a standalone SDK."
 
-IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
+IMAGE_FEATURES += "splash tools-sdk dev-pkgs ssh-server-openssh \
 	tools-debug tools-profile tools-testapps debug-tweaks"
 
 

index 8435596..2c47dc6 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "A foundational basic image without support for X that can be \
 reasonably used for customization and is suitable for implementations that \
 conform to Linux Standard Base (LSB)."
 
-IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
+IMAGE_FEATURES += "splash ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \

index 496246e..b0f25cf 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
 which enables development of rich and animated graphical user interfaces."
 
-IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 

index 73a707d..64dc053 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "A very basic X11 image with a terminal"
 
-IMAGE_FEATURES += "apps-console-core package-management x11-base"
+IMAGE_FEATURES += "splash package-management x11-base"
 
 LICENSE = "MIT"
 

index 6b6c761..f52a1a5 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
 mobile devices. The image supports X11 with a Sato theme, Pimlico \
 applications, and contains terminal, editor, and file manager."
 
-IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 

index 0f96202..59ec1fa 100644
@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r16"
+INC_PR = "r17"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""

@@ -87,6 +87,7 @@ RPROVIDES_${PN} = "\
 	"
 
 RDEPENDS_${PN} = "\
+	dbus \
 	${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
 	${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
 	${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \

index 573c778..48513b2 100644
@@ -19,6 +19,8 @@ do_install_append() {
 
 PACKAGES =+ "${PN}-tests"
 
+RDEPENDS_${PN} += "dbus"
+
 FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
 FILES_${PN}-tests = "${libdir}/ofono"
 RDEPENDS_${PN}-tests = "python python-pygobject"

index 0a69fff..f79f34f 100644
@@ -3,7 +3,7 @@ require ofono.inc
 S	 = "${WORKDIR}/git"
 SRCREV = "14544d5996836f628613c2ce544380ee6fc8f514"
 PV	 = "0.12-git${SRCPV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI  = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
 	    file://ofono"

index 39bb594..63fea28 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2007 OpenedHand Ltd
 #
 
-DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
+SUMMARY = "Host packages for the standalone SDK or external toolchain"
 PR = "r11"
 LICENSE = "MIT"
 

index 46db72d..f151591 100644
@@ -119,6 +119,7 @@ python __anonymous () {
 #
 # packages added by distribution
 #
+SUMMARY_packagegroup-distro-base = "${DISTRO} extras"
 DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}"
 RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
 RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"

@@ -126,35 +127,44 @@ RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
 #
 # packages added by machine config
 #
+SUMMARY_packagegroup-machine-base = "${MACHINE} extras"
+DESCRIPTION_packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware"
 RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
 RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
 
+SUMMARY_packagegroup-base-keyboard = "Keyboard support"
 RDEPENDS_packagegroup-base-keyboard = "\
     keymaps"
 
+SUMMARY_packagegroup-base-pci = "PCI bus support"
 RDEPENDS_packagegroup-base-pci = "\
     pciutils"
 
+SUMMARY_packagegroup-base-acpi = "ACPI support"
 RDEPENDS_packagegroup-base-acpi = "\
     acpid \
     libacpi "
 
+SUMMARY_packagegroup-base-apm = "APM support"
 RDEPENDS_packagegroup-base-apm = "\
     ${VIRTUAL-RUNTIME_apm} \
     apmd"
 
+SUMMARY_packagegroup-base-ext2 = "ext2 filesystem support"
 RDEPENDS_packagegroup-base-ext2 = "\
     hdparm \
     e2fsprogs \
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs"
 
+SUMMARY_packagegroup-base-vfat = "FAT filesystem support"
 RRECOMMENDS_packagegroup-base-vfat = "\
     kernel-module-msdos \
     kernel-module-vfat \
     kernel-module-nls-iso8859-1 \
     kernel-module-nls-cp437"
 
+SUMMARY_packagegroup-base-alsa = "ALSA sound support"
 RDEPENDS_packagegroup-base-alsa = "\
     alsa-utils-alsactl \
     alsa-utils-alsamixer \

@@ -164,11 +174,11 @@ RRECOMMENDS_packagegroup-base-alsa = "\
     kernel-module-snd-mixer-oss \
     kernel-module-snd-pcm-oss"
 
+SUMMARY_packagegroup-base-pcmcia = "PC card slot support"
 RDEPENDS_packagegroup-base-pcmcia = "\
     pcmciautils \
     "
 
-
 RRECOMMENDS_packagegroup-base-pcmcia = "\
     kernel-module-pcmcia \
     kernel-module-airo-cs \

@@ -180,6 +190,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
+SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
 RDEPENDS_packagegroup-base-bluetooth = "\
     bluez4 \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \

@@ -201,6 +212,7 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
     "
 
+SUMMARY_packagegroup-base-irda = "IrDA support"
 RDEPENDS_packagegroup-base-irda = "\
     irda-utils"
 

@@ -217,6 +229,7 @@ RRECOMMENDS_packagegroup-base-irda = "\
     kernel-module-sir-dev \
     ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
 
+SUMMARY_packagegroup-base-usbgadget = "USB gadget support"
 RRECOMMENDS_packagegroup-base-usbgadget = "\
     kernel-module-pxa27x_udc \
     kernel-module-gadgetfs \

@@ -224,6 +237,7 @@ RRECOMMENDS_packagegroup-base-usbgadget = "\
     kernel-module-g-serial \
     kernel-module-g-ether"
 
+SUMMARY_packagegroup-base-usbhost = "USB host support"
 RDEPENDS_packagegroup-base-usbhost = "\
     usbutils "
 

@@ -241,6 +255,7 @@ RRECOMMENDS_packagegroup-base-usbhost = "\
     kernel-module-usbserial \
     kernel-module-usb-storage "
 
+SUMMARY_packagegroup-base-ppp = "PPP dial-up protocol support"
 RDEPENDS_packagegroup-base-ppp = "\
     ppp \
     ppp-dialin"

@@ -252,6 +267,7 @@ RRECOMMENDS_packagegroup-base-ppp = "\
     kernel-module-ppp-mppe \
     kernel-module-slhc"
 
+SUMMARY_packagegroup-base-ipsec = "IPSEC support"
 RDEPENDS_packagegroup-base-ipsec = "\
     "
 

@@ -262,6 +278,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\
 # packagegroup-base-wifi contain everything needed to get WiFi working
 # WEP/WPA connection needs to be supported out-of-box
 #
+SUMMARY_packagegroup-base-wifi = "WiFi support"
 RDEPENDS_packagegroup-base-wifi = "\
     wireless-tools \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \

@@ -282,6 +299,7 @@ RRECOMMENDS_packagegroup-base-wifi = "\
     kernel-module-aes-generic \
     kernel-module-aes"
 
+SUMMARY_packagegroup-base-3g = "Cellular data support"
 RDEPENDS_packagegroup-base-3g = "\
     ofono"
 

@@ -289,34 +307,41 @@ RRECOMMENDS_packagegroup-base-3g = "\
     kernel-module-cdc-acm \
     kernel-module-cdc-wdm"
 
+SUMMARY_packagegroup-base-smbfs = "SMB network filesystem support"
 RRECOMMENDS_packagegroup-base-smbfs = "\
     kernel-module-cifs \
     kernel-module-smbfs"
 
+SUMMARY_packagegroup-base-cramfs = "cramfs filesystem support"
 RRECOMMENDS_packagegroup-base-cramfs = "\
     kernel-module-cramfs"
 
 #
 # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package
 #
+SUMMARY_packagegroup-base-nfs = "NFS network filesystem support"
 RDEPENDS_packagegroup-base-nfs = "\
     portmap"
 
 RRECOMMENDS_packagegroup-base-nfs = "\
     kernel-module-nfs "
 
+SUMMARY_packagegroup-base-zeroconf = "Zeroconf support"
 RDEPENDS_packagegroup-base-zeroconf = "\
     avahi-daemon"
 
+SUMMARY_packagegroup-base-ipv6 = "IPv6 support"
 RDEPENDS_packagegroup-base-ipv6 = "\
     "
 
 RRECOMMENDS_packagegroup-base-ipv6 = "\
     kernel-module-ipv6 "
 
+SUMMARY_packagegroup-base-serial = "Serial port support"
 RDEPENDS_packagegroup-base-serial = "\
     setserial \
     lrzsz "
 
+SUMMARY_packagegroup-base-phone = "Cellular telephony (voice) support"
 RDEPENDS_packagegroup-base-phone = "\
     ofono"

index a2970d9..4b1208e 100644
@@ -2,7 +2,8 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
+SUMMARY = "Minimal boot requirements"
+DESCRIPTION = "The minimal set of packages required to boot the system"
 LICENSE = "MIT"
 DEPENDS = "virtual/kernel"
 PR = "r9"

index 7b9abdd..09414069 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = "NFS tasks for Poky"
+DESCRIPTION = "NFS package groups"
 LICENSE = "MIT"
 PR = "r1"
 

@@ -10,6 +10,7 @@ inherit packagegroup
 
 PACKAGES = "${PN}-server"
 
+SUMMARY_${PN}-server = "NFS server"
 RDEPENDS_${PN}-server = "\
     nfs-utils \
     nfs-utils-client \

index e944ec5..c79f092 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
+SUMMARY = "Software development tools"
 LICENSE = "MIT"
 PR = "r8"
 

index dd47d0c..7d71c0c 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "Dropbear SSH task for Poky"
+SUMMARY = "Dropbear SSH client/server"
 LICENSE = "MIT"
 PR = "r0"
 

index 8a61b4f..f97b010 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenSSH SSH task for Poky"
+SUMMARY = "OpenSSH SSH client/server"
 LICENSE = "MIT"
 PR = "r0"
 

index 06903a4..a6da660 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Debug tools tasks for OE-Core"
+SUMMARY = "Debugging tools"
 LICENSE = "MIT"
 
 inherit packagegroup

index bdf0d74..6a69363 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Profile tools tasks for OE-Core"
+SUMMARY = "Profiling tools"
 LICENSE = "MIT"
 
 inherit packagegroup

index 500f119..1aca97d 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Test apps task for OE-Core"
+SUMMARY = "Testing tools/applications"
 LICENSE = "MIT"
 
 inherit packagegroup

index fcae851..f8e527b 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "Host SDK package for cross canadian toolchain" 
+SUMMARY = "Host SDK package for cross canadian toolchain"
 PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 PR = "r0"
 LICENSE = "MIT"

index 67e3f3c..de0a46d 100644
@@ -2,7 +2,8 @@
 # Copyright (C) 2010 Intel Corporation
 #
 
-DESCRIPTION = "Create Basic Image Tasks"
+SUMMARY = "Self-hosting"
+DESCRIPTION = "Packages required to run the build system"
 PR = "r11"
 LICENSE = "MIT"
 

index 0e3998d..b8031e5 100644
@@ -2,7 +2,8 @@
 # Copyright (C) 2010 Intel Corporation
 #
 
-DESCRIPTION = "Create Small Image Tasks"
+SUMMARY = "Linux Standard Base (LSB)"
+DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specification"
 PR = "r9"
 LICENSE = "MIT"
 

index 782df1f..64b572d 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
+SUMMARY = "GNOME Mobile And Embedded SDK (host tools)"
 LICENSE = "MIT"
 PR = "r12"
 

index c560049..95067c4 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
+SUMMARY = "GNOME Mobile And Embedded SDK (target tools)"
 LICENSE = "MIT"
 PR = "r14"
 

index 2c62820..08dd090 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2007 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
+SUMMARY = "Clutter package groups"
 LICENSE = "MIT"
 
 PR = "r4"

@@ -13,6 +13,7 @@ PACKAGES = "\
     ${PN}-core \
     "
 
+SUMMARY_${PN}-core = "Clutter graphics library"
 RDEPENDS_${PN}-core = "\
     clutter-1.8 \
     clutter-gst-1.8 \

index df22cd5..6d92a38 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "gkt+ over directfb without x11"
+SUMMARY = "GTK+ over DirectFB without X11"
 PR = "r0"
 LICENSE = "MIT"
 

index 1f17f01..75574c1 100644
@@ -1,4 +1,5 @@
-DESCRIPTION = "Tasks for core X11 applications"
+SUMMARY = "Basic X11 session"
+DESCRIPTION = "Packages required to set up a basic working X11 session"
 LICENSE = "MIT"
 PR = "r0"
 

index 7099c70..3704521 100644
@@ -2,7 +2,6 @@
 # Copyright (C) 2011 Intel Corporation
 #
 
-DESCRIPTION = "Tasks for core X11 applications"
 LICENSE = "MIT"
 PR = "r36"
 

@@ -20,15 +19,18 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
 # elsa, xserver-nodm-init
 VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
+SUMMARY = "X11 display server and basic utilities"
 RDEPENDS_${PN} = "\
     ${PN}-xserver \
     ${PN}-utils \
     "
 
+SUMMARY_${PN}-xserver = "X11 display server"
 RDEPENDS_${PN}-xserver = "\
     ${XSERVER} \
     "
 
+SUMMARY_${PN}-utils = "X11 basic utilities and init"
 RDEPENDS_${PN}-utils = "\
     ${VIRTUAL-RUNTIME_xserver_common} \
     ${VIRTUAL-RUNTIME_graphical_init_manager} \

index d59cb4b..623a48f 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2010  Intel Corporation. All rights reserved
 #
 
-DESCRIPTION = "Qt Tasks for Poky"
+DESCRIPTION = "Qt package groups"
 LICENSE = "MIT"
 PR = "r3"
 

@@ -12,4 +12,5 @@ PACKAGES = "${PN}-demoapps"
 
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
 
+SUMMARY_${PN}-demoapps = "Qt demo applications"
 RDEPENDS_${PN}-demoapps = "${QTDEMOS}"

index de8341b..74ae7dd 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "QT4 Embedded base Image Feed"
+SUMMARY = "Qt for Embedded Linux (Qt without X11)"
 PR = "r1"
 LICENSE = "MIT"
 

index ebd2df1..b3b84e2 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2007-2008 OpenedHand Ltd.
 #
 
-DESCRIPTION = "Sato Tasks for Poky"
+SUMMARY = "Sato desktop"
 LICENSE = "MIT"
 PR = "r32"
 

@@ -21,6 +21,7 @@ RDEPENDS_${PN} = "\
 NETWORK_MANAGER ?= "connman-gnome"
 NETWORK_MANAGER_libc-uclibc = ""
 
+SUMMARY_${PN}-base = "Sato desktop - base packages"
 RDEPENDS_${PN}-base = "\
     matchbox-desktop \
     matchbox-session-sato \

@@ -44,6 +45,7 @@ FILEMANAGER_mips ?= ""
 WEB ?= ""
 #WEB = "web-webkit"
 
+SUMMARY_${PN}-apps = "Sato desktop - applications"
 RDEPENDS_${PN}-apps = "\
     gthumb \
     leafpad \

@@ -55,6 +57,7 @@ RDEPENDS_${PN}-apps = "\
     ${WEB} \
     "
 
+SUMMARY_${PN}-games = "Sato desktop - games"
 RDEPENDS_${PN}-games = "\
     oh-puzzles \
     "

index b2489fe..4e4bcf5 100644
@@ -10,34 +10,26 @@ inherit packagegroup
 
 PACKAGES = "\
     packagegroup-core-basic \
-    packagegroup-core-base-utils \
     packagegroup-core-basic-libs \
     packagegroup-core-basic-utils \
     packagegroup-core-basic-extended \
     packagegroup-core-dev-utils \
     packagegroup-core-multiuser \
     packagegroup-core-initscripts \
-    packagegroup-core-rpm \
     packagegroup-core-sys-services \
     "
 
 
 RDEPENDS_packagegroup-core-basic = "\
-    packagegroup-core-base-utils \
     packagegroup-core-basic-libs \
     packagegroup-core-basic-utils \
     packagegroup-core-basic-extended \
     packagegroup-core-dev-utils \
     packagegroup-core-multiuser \
     packagegroup-core-initscripts \
-    packagegroup-core-rpm \
     packagegroup-core-sys-services \
     "
 
-RDEPENDS_packagegroup-core-base-utils = "\
-    busybox \
-    "
-
 RDEPENDS_packagegroup-core-basic-libs = "\
     glib-2.0 \
     "

@@ -106,12 +98,6 @@ RDEPENDS_packagegroup-core-multiuser = "\
     sudo \
     "
 
-RDEPENDS_packagegroup-core-rpm = "\
-    beecrypt \
-    rpm \
-    zypper \
-    "
-
 RDEPENDS_packagegroup-core-sys-services = "\
     at \
     bzip2 \

index b8031e5..707ccc1 100644
@@ -13,43 +13,39 @@ PACKAGES = "\
     packagegroup-core-lsb \
     packagegroup-core-sys-extended \
     packagegroup-core-db \
-    packagegroup-core-misc \
     packagegroup-core-perl \
     packagegroup-core-python \
     packagegroup-core-tcl \
-    packagegroup-core-lsb-perl-add \
-    packagegroup-core-lsb-python-add \
-    packagegroup-core-lsb-graphic-add \
+    packagegroup-core-lsb-misc \
+    packagegroup-core-lsb-core \
+    packagegroup-core-lsb-perl \
+    packagegroup-core-lsb-python \
+    packagegroup-core-lsb-desktop \
     packagegroup-core-lsb-runtime-add \
-    packagegroup-core-lsb-command-add \
     "
 
 
 RDEPENDS_packagegroup-core-lsb = "\
     packagegroup-core-sys-extended \
     packagegroup-core-db \
-    packagegroup-core-misc \
     packagegroup-core-perl \
     packagegroup-core-python \
     packagegroup-core-tcl \
-    packagegroup-core-lsb-perl-add \
-    packagegroup-core-lsb-python-add \
-    packagegroup-core-lsb-graphic-add \
+    packagegroup-core-lsb-misc \
+    packagegroup-core-lsb-core \
+    packagegroup-core-lsb-perl \
+    packagegroup-core-lsb-python \
+    packagegroup-core-lsb-desktop \
     packagegroup-core-lsb-runtime-add \
-    packagegroup-core-lsb-command-add \
     "
 
+
 RDEPENDS_packagegroup-core-sys-extended = "\
-    binutils \
-    binutils-symlinks \
-    chkconfig \
     curl \
     dhcp-client \
-    diffutils \
     gamin \
     hdparm \
     libaio \
-    libxml2 \
     lrzsz \
     lzo \
     mc \

@@ -67,7 +63,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\
     which \
     xinetd \
     zip \
-    lsbinitscripts \
     "
 
 RDEPENDS_packagegroup-core-db = "\

@@ -97,48 +92,98 @@ RDEPENDS_packagegroup-core-tcl = "\
     tcl \
     "
 
-RDEPENDS_packagegroup-core-misc = "\
-    elfutils \
+# Miscellaneous packages required by LSB (or LSB tests)
+RDEPENDS_packagegroup-core-lsb-misc = "\
+    chkconfig \
     gettext \
     gettext-runtime \
     groff \
-    lsb \
+    lsbinitscripts \
     lsbsetup \
     lsbtest \
     lsof \
-    man \
-    man-pages \
-    ncurses \
     strace \
     libusb1 \
     usbutils \
-    zlib \
+    rpm \
     "
 
-RDEPENDS_packagegroup-core-lsb-command-add = "\
-    localedef \
+SUMMARY_packagegroup-core-lsb-core = "LSB Core"
+DESCRIPTION_packagegroup-core-lsb-core = "Packages required to support commands/libraries \
+    specified in the LSB Core specification"
+RDEPENDS_packagegroup-core-lsb-core = "\
+    at \
+    bash \
+    bc \
+    binutils \
+    binutils-symlinks \
+    coreutils \
+    cpio \
+    cronie \
+    cups \
+    diffutils \
+    ed \
+    eglibc-utils \
+    elfutils \
+    file \
+    findutils \
     fontconfig-utils \
+    foomatic-filters \
+    gawk \
+    ghostscript \
+    grep \
+    gzip \
+    localedef \
+    lsb \
+    m4 \
     mailx \
+    make \
+    man \
+    man-pages \
+    mktemp \
     msmtp \
-    chkconfig \
+    patch \
+    pax \
+    procps \
+    psmisc \
+    sed \
+    shadow \
+    tar \
+    time \
+    util-linux \
     xdg-utils \
-    foomatic-filters \
-    cups \
-    ghostscript \
+    \
+    eglibc \
+    libgcc \
+    libpam \
+    libxml2 \
+    ncurses \
+    zlib \
 "
 
-RDEPENDS_packagegroup-core-lsb-perl-add = "\
+SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"
+DESCRIPTION_packagegroup-core-lsb-perl = "Packages required to support libraries \
+    specified in the LSB Runtime languages specification (Perl parts)"
+RDEPENDS_packagegroup-core-lsb-perl = "\
+    perl \
     perl-modules \
     perl-misc \
     perl-pod \
 "
 
-RDEPENDS_packagegroup-core-lsb-python-add = "\
+SUMMARY_packagegroup-core-lsb-python = "LSB Runtime Languages (Python)"
+DESCRIPTION_packagegroup-core-lsb-python = "Packages required to support libraries \
+    specified in the LSB Runtime languages specification (Python parts)"
+RDEPENDS_packagegroup-core-lsb-python = "\
+    python \
     python-modules \
     python-misc \
 "
 
-RDEPENDS_packagegroup-core-lsb-graphic-add = "\
+SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop"
+DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \
+    specified in the LSB Desktop specification"
+RDEPENDS_packagegroup-core-lsb-desktop = "\
     libqtcore4 \
     libqtgui4 \
     libqtsql4 \

@@ -181,7 +226,6 @@ RDEPENDS_packagegroup-core-lsb-runtime-add = "\
     eglibc-localedata-posix \
     eglibc-extra-nss \
     eglibc-pcprofile \
-    eglibc-utils \
 "
 
 PTH = "pth"

index 06f15a8..091f57d 100644
@@ -1,5 +1,5 @@
-DESCRIPTION = "A foundational basic image without support for X that can be \
-reasonably used for customization."
+DESCRIPTION = "A console-only image with more full-featured Linux system \
+functionality installed."
 
 IMAGE_FEATURES += "splash ssh-server-openssh"
 

@@ -8,6 +8,4 @@ IMAGE_INSTALL = "\
     packagegroup-core-basic \
     "
 
-#    ${CORE_IMAGE_BASE_INSTALL} 
-
 inherit core-image

index f151591..2178308 100644
@@ -114,6 +114,15 @@ python __anonymous () {
 
     if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
         d.setVar("ADD_3G", "packagegroup-base-3g")
+
+    # For backwards compatibility after rename
+    packages = d.getVar("PACKAGES", True).split()
+    packages.remove("packagegroup-distro-base")
+    packages.remove("packagegroup-machine-base")
+    for pkg in packages:
+        d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-base", "task-base"))
+    d.appendVar("RPROVIDES_packagegroup-distro-base", "task-distro-base")
+    d.appendVar("RPROVIDES_packagegroup-machine-base", "task-machine-base")
 }
 
 #

index 4b1208e..d29dc2b 100644
@@ -18,6 +18,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-boot"
+
 # Distro can override the following VIRTUAL-RUNTIME providers:
 VIRTUAL-RUNTIME_dev_manager ?= "udev"
 VIRTUAL-RUNTIME_login_manager ?= "tinylogin"

index 09414069..03f9c12 100644
@@ -10,6 +10,9 @@ inherit packagegroup
 
 PACKAGES = "${PN}-server"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN}-server = "task-core-nfs-server"
+
 SUMMARY_${PN}-server = "NFS server"
 RDEPENDS_${PN}-server = "\
     nfs-utils \

index c79f092..f05e099 100644
@@ -10,6 +10,9 @@ inherit packagegroup
 
 #PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
+# For backwards compatibility after rename
+RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
+
 RDEPENDS_packagegroup-core-sdk = "\
     autoconf \
     automake \

index 7d71c0c..7fa06e9 100644
@@ -4,4 +4,7 @@ PR = "r0"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-ssh-dropbear"
+
 RDEPENDS_${PN} = "dropbear"

index f97b010..3221e8b 100644
@@ -4,4 +4,7 @@ PR = "r0"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-ssh-openssh"
+
 RDEPENDS_${PN} = "openssh"

index 078e7dd..b7b5a29 100644
@@ -6,6 +6,9 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-standalone-sdk-target"
+
 RDEPENDS_${PN} = "\
     libgcc \
     libgcc-dev \

index a6da660..6687b32 100644
@@ -11,6 +11,9 @@ PR = "r1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-debug"
+
 MTRACE = ""
 MTRACE_libc-glibc = "libc-mtrace"
 

index 6a69363..931984e 100644
@@ -9,6 +9,9 @@ inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-profile"
+
 RRECOMMENDS_${PN} = "\
     perf \
     trace-cmd \

index 1aca97d..9720e5a 100644
@@ -9,6 +9,9 @@ inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-testapps"
+
 # kexec-tools doesn't work on Mips
 KEXECTOOLS ?= "kexec"
 KEXECTOOLS_mips ?= ""

index f8e527b..cb2fb1a 100644
@@ -7,6 +7,9 @@ inherit cross-canadian packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+
 RDEPENDS_${PN} = "\
     binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
     gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \

index 4e4bcf5..30b66c5 100644
@@ -19,6 +19,13 @@ PACKAGES = "\
     packagegroup-core-sys-services \
     "
 
+python __anonymous () {
+    # For backwards compatibility after rename
+    packages = d.getVar("PACKAGES", True).split()
+    for pkg in packages:
+        d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
+}
+
 
 RDEPENDS_packagegroup-core-basic = "\
     packagegroup-core-basic-libs \

index 707ccc1..120326f 100644
@@ -25,6 +25,7 @@ PACKAGES = "\
     "
 
 
+RPROVIDES_packagegroup-core-lsb = "task-core-lsb"
 RDEPENDS_packagegroup-core-lsb = "\
     packagegroup-core-sys-extended \
     packagegroup-core-db \

index 64b572d..e959c5b 100644
@@ -12,6 +12,9 @@ require packagegroup-sdk-gmae.inc
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-sdk-gmae"
+
 RDEPENDS_${PN} = "\
     packagegroup-core-sdk \
     libglade-dev \

index 95067c4..69c5340 100644
@@ -12,6 +12,9 @@ require packagegroup-sdk-gmae.inc
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"
+
 RDEPENDS_${PN} = "\
     packagegroup-core-standalone-sdk-target \
     libglade-dev \

index 08dd090..37e9a87 100644
@@ -13,6 +13,9 @@ PACKAGES = "\
     ${PN}-core \
     "
 
+# For backwards compatibility after rename
+RPROVIDES_${PN}-core = "task-core-clutter-core"
+
 SUMMARY_${PN}-core = "Clutter graphics library"
 RDEPENDS_${PN}-core = "\
     clutter-1.8 \

index 6d92a38..d6c2985 100644
@@ -4,6 +4,9 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-gtk-directfb-base"
+
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

index 75574c1..ebae741 100644
@@ -5,6 +5,9 @@ PR = "r0"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
+
 RDEPENDS_${PN} = "\
     packagegroup-core-x11-xserver \
     packagegroup-core-x11-utils \

index 623a48f..ed13354 100644
@@ -10,6 +10,9 @@ inherit packagegroup
 
 PACKAGES = "${PN}-demoapps"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
+
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
 
 SUMMARY_${PN}-demoapps = "Qt demo applications"

index 74ae7dd..042efb8 100644
@@ -4,6 +4,9 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-qt4e-base"
+
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

index b3b84e2..5d781ae 100644
@@ -12,6 +12,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-x11-sato"
+
 RDEPENDS_${PN} = "\
     ${PN}-base \
     ${PN}-apps \