Rename task to packagegroup

"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.

(From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

8 files changed, 213 insertions, 213 deletions

diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index f801346376..9aa880ec4f 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -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} 
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 3bb78003af..557259b1b6 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -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
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 7601410828..d07f90d527 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -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 \
     "
 
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index b370d49c58..8435596da1 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -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
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
index b4e7ab02fb..26c7307deb 100644
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch
@@ -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 <mark.hatle@windriver.com>
 
@@ -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"; }
  
    ///////////////////////////////////////////////////////////////////
  
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
new file mode 100644
index 0000000000..a7e3eb75c5
--- /dev/null
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -0,0 +1,156 @@
+#
+# Copyright (C) 2010 Intel Corporation
+#
+
+DESCRIPTION = "Create Basic Image Tasks"
+PR = "r4"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+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 \
+    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 \
+    "
+
+RDEPENDS_packagegroup-core-basic-utils = "\
+    bash \
+    acl \
+    attr \
+    bc \
+    coreutils \
+    cpio \
+    e2fsprogs \
+    ed \
+    file \
+    findutils \
+    gawk \
+    gmp \
+    grep \
+    makedevs \
+    mc \
+    mktemp \
+    ncurses \
+    net-tools \
+    pax \
+    popt \
+    procps \
+    psmisc \
+    sed \
+    tar \
+    time \
+    udev \
+    util-linux \
+    zlib \
+    "
+
+RDEPENDS_packagegroup-core-basic-extended = "\
+    iproute2 \
+    iputils \
+    iptables \
+    module-init-tools \
+    openssl \
+    "
+
+RDEPENDS_packagegroup-core-dev-utils = "\
+    byacc \
+    diffutils \
+    m4 \
+    make \
+    patch \
+    "
+
+RDEPENDS_packagegroup-core-initscripts = "\
+    initscripts \
+    sysvinit \
+    ethtool \
+    mingetty \
+    sysklogd \
+    "
+
+RDEPENDS_packagegroup-core-multiuser = "\
+    cracklib \
+    gzip \
+    libuser \
+    libpam \
+    shadow \
+    sudo \
+    "
+
+RDEPENDS_packagegroup-core-rpm = "\
+    beecrypt \
+    rpm \
+    zypper \
+    "
+
+RDEPENDS_packagegroup-core-sys-services = "\
+    at \
+    bzip2 \
+    cronie \
+    dbus \
+    dbus-glib \
+    python-dbus \
+    elfutils \
+    gzip \
+    less \
+    libcap \
+    libevent \
+    lighttpd \
+    logrotate \
+    nfs-utils \
+    pciutils \
+    libpcre \
+    rpcbind \
+    sysfsutils \
+    tcp-wrappers \
+    tzdata \
+    "
+
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index be9eac2954..984ed36940 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -9,50 +9,50 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PACKAGES = "\
-    task-core-lsb \
-    task-core-sys-extended \
-    task-core-sys-extended-dbg \
-    task-core-sys-extended-dev \
-    task-core-db \
-    task-core-db-dbg \
-    task-core-db-dev \
-    task-core-misc \
-    task-core-misc-dbg \
-    task-core-misc-dev \
-    task-core-perl \
-    task-core-perl-dbg \
-    task-core-perl-dev \
-    task-core-python \
-    task-core-python-dbg \
-    task-core-python-dev \
-    task-core-tcl \
-    task-core-tcl-dbg \
-    task-core-tcl-dev \
-    task-core-lsb-perl-add \
-    task-core-lsb-python-add \
-    task-core-lsb-graphic-add \
-    task-core-lsb-runtime-add \
-    task-core-lsb-command-add \
+    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 \
+    packagegroup-core-lsb-runtime-add \
+    packagegroup-core-lsb-command-add \
     "
 
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-core-lsb = "\
-    task-core-sys-extended \
-    task-core-db \
-    task-core-misc \
-    task-core-perl \
-    task-core-python \
-    task-core-tcl \
-    task-core-lsb-perl-add \
-    task-core-lsb-python-add \
-    task-core-lsb-graphic-add \
-    task-core-lsb-runtime-add \
-    task-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-runtime-add \
+    packagegroup-core-lsb-command-add \
     "
 
-RDEPENDS_task-core-sys-extended = "\
+RDEPENDS_packagegroup-core-sys-extended = "\
     binutils \
     binutils-symlinks \
     chkconfig \
@@ -83,19 +83,19 @@ RDEPENDS_task-core-sys-extended = "\
     lsbinitscripts \
     "
 
-RDEPENDS_task-core-db = "\
+RDEPENDS_packagegroup-core-db = "\
     db \
     sqlite3 \
     "
 
-RDEPENDS_task-core-perl = "\
+RDEPENDS_packagegroup-core-perl = "\
     gdbm \
     perl \
     zlib \
     "
 
 
-RDEPENDS_task-core-python = "\
+RDEPENDS_packagegroup-core-python = "\
     expat \
     gdbm \
     gmp \
@@ -106,11 +106,11 @@ RDEPENDS_task-core-python = "\
     zip \
     "
 
-RDEPENDS_task-core-tcl = "\
+RDEPENDS_packagegroup-core-tcl = "\
     tcl \
     "
 
-RDEPENDS_task-core-misc = "\
+RDEPENDS_packagegroup-core-misc = "\
     elfutils \
     gettext \
     gettext-runtime \
@@ -128,7 +128,7 @@ RDEPENDS_task-core-misc = "\
     zlib \
     "
 
-RDEPENDS_task-core-lsb-command-add = "\
+RDEPENDS_packagegroup-core-lsb-command-add = "\
     localedef \
     fontconfig-utils \
     mailx \
@@ -140,18 +140,18 @@ RDEPENDS_task-core-lsb-command-add = "\
     ghostscript \
 "
 
-RDEPENDS_task-core-lsb-perl-add = "\
+RDEPENDS_packagegroup-core-lsb-perl-add = "\
     perl-modules \
     perl-misc \
     perl-pod \
 "
 
-RDEPENDS_task-core-lsb-python-add = "\
+RDEPENDS_packagegroup-core-lsb-python-add = "\
     python-modules \
     python-misc \
 "
 
-RDEPENDS_task-core-lsb-graphic-add = "\
+RDEPENDS_packagegroup-core-lsb-graphic-add = "\
     libqtcore4 \
     libqtgui4 \
     libqtsql4 \
@@ -178,7 +178,7 @@ RDEPENDS_task-core-lsb-graphic-add = "\
     ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
 "
 
-RDEPENDS_task-core-lsb-runtime-add = "\
+RDEPENDS_packagegroup-core-lsb-runtime-add = "\
     ldd \
     pam-plugin-wheel \
     e2fsprogs-mke2fs \
diff --git a/meta/recipes-extended/tasks/task-core-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb
deleted file mode 100644
index a810d3785b..0000000000
--- a/meta/recipes-extended/tasks/task-core-basic.bb
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-# Copyright (C) 2010 Intel Corporation
-#
-
-DESCRIPTION = "Create Basic Image Tasks"
-PR = "r4"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PACKAGES = "\
-    task-core-basic \
-    task-core-base-utils \
-    task-core-base-utils-dbg \
-    task-core-base-utils-dev \
-    task-core-basic-libs \
-    task-core-basic-libs-dbg \
-    task-core-basic-libs-dev \
-    task-core-basic-utils \
-    task-core-basic-utils-dbg \
-    task-core-basic-utils-dev \
-    task-core-basic-extended \
-    task-core-basic-extended-dbg \
-    task-core-basic-extended-dev \
-    task-core-dev-utils \
-    task-core-dev-utils-dbg \
-    task-core-dev-utils-dev \
-    task-core-multiuser \
-    task-core-multiuser-dbg \
-    task-core-multiuser-dev \
-    task-core-initscripts \
-    task-core-initscripts-dbg \
-    task-core-initscripts-dev \
-    task-core-rpm \
-    task-core-rpm-dbg \
-    task-core-rpm-dev \
-    task-core-sys-services \
-    task-core-sys-services-dbg \
-    task-core-sys-services-dev \
-    "
-
-ALLOW_EMPTY = "1"
-
-RDEPENDS_task-core-basic = "\
-    task-core-base-utils \
-    task-core-basic-libs \
-    task-core-basic-utils \
-    task-core-basic-extended \
-    task-core-dev-utils \
-    task-core-multiuser \
-    task-core-initscripts \
-    task-core-rpm \
-    task-core-sys-services \
-    "
-
-RDEPENDS_task-core-base-utils = "\
-    busybox \
-    "
-
-RDEPENDS_task-core-basic-libs = "\
-    glib-2.0 \
-    "
-
-RDEPENDS_task-core-basic-utils = "\
-    bash \
-    acl \
-    attr \
-    bc \
-    coreutils \
-    cpio \
-    e2fsprogs \
-    ed \
-    file \
-    findutils \
-    gawk \
-    gmp \
-    grep \
-    makedevs \
-    mc \
-    mktemp \
-    ncurses \
-    net-tools \
-    pax \
-    popt \
-    procps \
-    psmisc \
-    sed \
-    tar \
-    time \
-    udev \
-    util-linux \
-    zlib \
-    "
-
-RDEPENDS_task-core-basic-extended = "\
-    iproute2 \
-    iputils \
-    iptables \
-    module-init-tools \
-    openssl \
-    "
-
-RDEPENDS_task-core-dev-utils = "\
-    byacc \
-    diffutils \
-    m4 \
-    make \
-    patch \
-    "
-
-RDEPENDS_task-core-initscripts = "\
-    initscripts \
-    sysvinit \
-    ethtool \
-    mingetty \
-    sysklogd \
-    "
-
-RDEPENDS_task-core-multiuser = "\
-    cracklib \
-    gzip \
-    libuser \
-    libpam \
-    shadow \
-    sudo \
-    "
-
-RDEPENDS_task-core-rpm = "\
-    beecrypt \
-    rpm \
-    zypper \
-    "
-
-RDEPENDS_task-core-sys-services = "\
-    at \
-    bzip2 \
-    cronie \
-    dbus \
-    dbus-glib \
-    python-dbus \
-    elfutils \
-    gzip \
-    less \
-    libcap \
-    libevent \
-    lighttpd \
-    logrotate \
-    nfs-utils \
-    pciutils \
-    libpcre \
-    rpcbind \
-    sysfsutils \
-    tcp-wrappers \
-    tzdata \
-    "
-