Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

11 files changed, 129 insertions, 129 deletions

diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 76d5dc2c7a..86972c3660 100644
--- a/meta/recipes-extended/images/poky-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,8 +1,8 @@
 IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
-    task-poky-boot \
-    task-poky-basic \
+    task-core-boot \
+    task-core-basic \
     "
 
 #    ${POKY_BASE_INSTALL} 
diff --git a/meta/recipes-extended/images/poky-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 578fbd0f06..86baf23de1 100644
--- a/meta/recipes-extended/images/poky-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-basic \
-    task-poky-lsb \
+    task-core-basic \
+    task-core-lsb \
     "
 
 inherit poky-image
diff --git a/meta/recipes-extended/images/core-image-lsb-live.bb b/meta/recipes-extended/images/core-image-lsb-live.bb
new file mode 100644
index 0000000000..72f10f78fe
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-live.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "LSB Bootable Live Image"
+
+require recipes-core/images/core-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-${MACHINE}.ext3"
+
+LICENSE = "MIT"
+
+do_bootimg[depends] += "core-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk-live.bb b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
new file mode 100644
index 0000000000..b01ae060f1
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "LSB SDK Bootable Live Image"
+
+require recipes-core/images/core-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-sdk-${MACHINE}.ext3"
+
+LICENSE = "MIT"
+
+do_bootimg[depends] += "core-image-lsb-sdk:do_rootfs"
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 967bb023d3..74ad1d2d8c 100644
--- a/meta/recipes-extended/images/poky-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkg
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-basic \
-    task-poky-lsb \
+    task-core-basic \
+    task-core-lsb \
     "
 
 inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 33532eac24..63180f5613 100644
--- a/meta/recipes-extended/images/poky-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-basic \
-    task-poky-lsb \
+    task-core-basic \
+    task-core-lsb \
     "
 
 inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb-live.bb b/meta/recipes-extended/images/poky-image-lsb-live.bb
deleted file mode 100644
index baa9ea0e4f..0000000000
--- a/meta/recipes-extended/images/poky-image-lsb-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "LSB Bootable Live Image"
-
-require recipes-core/images/poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "poky-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb b/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
deleted file mode 100644
index 370780a062..0000000000
--- a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "LSB SDK Bootable Live Image"
-
-require recipes-core/images/poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-sdk-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "poky-image-lsb-sdk:do_rootfs"
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
index 9128237755..e5963dfc3b 100644
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch
@@ -3,7 +3,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-poky-rpm.
+Hack: for now set to task-core-rpm.
 
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
@@ -15,7 +15,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
  
    std::string ZConfig::distroverpkg() const
 -  { return "redhat-release"; }
-+  { return "task-poky-rpm"; }
++  { return "task-core-rpm"; }
  
    ///////////////////////////////////////////////////////////////////
  
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb
index 68c996dc88..e2a37d1160 100644
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-core-basic.bb
@@ -9,59 +9,59 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PACKAGES = "\
-    task-poky-basic \
-    task-poky-base-utils \
-    task-poky-base-utils-dbg \
-    task-poky-base-utils-dev \
-    task-poky-basic-libs \
-    task-poky-basic-libs-dbg \
-    task-poky-basic-libs-dev \
-    task-poky-basic-utils \
-    task-poky-basic-utils-dbg \
-    task-poky-basic-utils-dev \
-    task-poky-basic-extended \
-    task-poky-basic-extended-dbg \
-    task-poky-basic-extended-dev \
-    task-poky-dev-utils \
-    task-poky-dev-utils-dbg \
-    task-poky-dev-utils-dev \
-    task-poky-multiuser \
-    task-poky-multiuser-dbg \
-    task-poky-multiuser-dev \
-    task-poky-initscripts \
-    task-poky-initscripts-dbg \
-    task-poky-initscripts-dev \
-    task-poky-rpm \
-    task-poky-rpm-dbg \
-    task-poky-rpm-dev \
-    task-poky-sys-services \
-    task-poky-sys-services-dbg \
-    task-poky-sys-services-dev \
+    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-poky-basic = "\
-    task-poky-base-utils \
-    task-poky-basic-libs \
-    task-poky-basic-utils \
-    task-poky-basic-extended \
-    task-poky-dev-utils \
-    task-poky-multiuser \
-    task-poky-initscripts \
-    task-poky-rpm \
-    task-poky-sys-services \
+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-poky-base-utils = "\
+RDEPENDS_task-core-base-utils = "\
     busybox \
     "
 
-RDEPENDS_task-poky-basic-libs = "\
+RDEPENDS_task-core-basic-libs = "\
     glib-2.0 \
     "
 
-RDEPENDS_task-poky-basic-utils = "\
+RDEPENDS_task-core-basic-utils = "\
     bash \
     acl \
     attr \
@@ -92,7 +92,7 @@ RDEPENDS_task-poky-basic-utils = "\
     zlib \
     "
 
-RDEPENDS_task-poky-basic-extended = "\
+RDEPENDS_task-core-basic-extended = "\
     iproute2 \
     iputils \
     iptables \
@@ -100,7 +100,7 @@ RDEPENDS_task-poky-basic-extended = "\
     openssl \
     "
 
-RDEPENDS_task-poky-dev-utils = "\
+RDEPENDS_task-core-dev-utils = "\
     byacc \
     diffutils \
     m4 \
@@ -108,7 +108,7 @@ RDEPENDS_task-poky-dev-utils = "\
     patch \
     "
 
-RDEPENDS_task-poky-initscripts = "\
+RDEPENDS_task-core-initscripts = "\
     initscripts \
     sysvinit \
     ethtool \
@@ -116,7 +116,7 @@ RDEPENDS_task-poky-initscripts = "\
     sysklogd \
     "
 
-RDEPENDS_task-poky-multiuser = "\
+RDEPENDS_task-core-multiuser = "\
     cracklib \
     gzip \
     libuser \
@@ -125,13 +125,13 @@ RDEPENDS_task-poky-multiuser = "\
     sudo \
     "
 
-RDEPENDS_task-poky-rpm = "\
+RDEPENDS_task-core-rpm = "\
     beecrypt \
     rpm \
     zypper \
     "
 
-RDEPENDS_task-poky-sys-services = "\
+RDEPENDS_task-core-sys-services = "\
     at \
     bzip2 \
     cronie \
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index b56c07beb2..ef8acb1359 100644
--- a/meta/recipes-extended/tasks/task-poky-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -9,50 +9,50 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PACKAGES = "\
-    task-poky-lsb \
-    task-poky-sys-extended \
-    task-poky-sys-extended-dbg \
-    task-poky-sys-extended-dev \
-    task-poky-db \
-    task-poky-db-dbg \
-    task-poky-db-dev \
-    task-poky-misc \
-    task-poky-misc-dbg \
-    task-poky-misc-dev \
-    task-poky-perl \
-    task-poky-perl-dbg \
-    task-poky-perl-dev \
-    task-poky-python \
-    task-poky-python-dbg \
-    task-poky-python-dev \
-    task-poky-tcl \
-    task-poky-tcl-dbg \
-    task-poky-tcl-dev \
-    task-poky-lsb-perl-add \
-    task-poky-lsb-python-add \
-    task-poky-lsb-graphic-add \
-    task-poky-lsb-runtime-add \
-    task-poky-lsb-command-add \
+    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 \
     "
 
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-poky-lsb = "\
-    task-poky-sys-extended \
-    task-poky-db \
-    task-poky-misc \
-    task-poky-perl \
-    task-poky-python \
-    task-poky-tcl \
-    task-poky-lsb-perl-add \
-    task-poky-lsb-python-add \
-    task-poky-lsb-graphic-add \
-    task-poky-lsb-runtime-add \
-    task-poky-lsb-command-add \
+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_task-poky-sys-extended = "\
+RDEPENDS_task-core-sys-extended = "\
     binutils \
     chkconfig \
     curl \
@@ -81,19 +81,19 @@ RDEPENDS_task-poky-sys-extended = "\
     zip \
     "
 
-RDEPENDS_task-poky-db = "\
+RDEPENDS_task-core-db = "\
     db \
     sqlite3 \
     "
 
-RDEPENDS_task-poky-perl = "\
+RDEPENDS_task-core-perl = "\
     gdbm \
     perl \
     zlib \
     "
 
 
-RDEPENDS_task-poky-python = "\
+RDEPENDS_task-core-python = "\
     expat \
     gdbm \
     gmp \
@@ -104,11 +104,11 @@ RDEPENDS_task-poky-python = "\
     zip \
     "
 
-RDEPENDS_task-poky-tcl = "\
+RDEPENDS_task-core-tcl = "\
     tcl \
     "
 
-RDEPENDS_task-poky-misc = "\
+RDEPENDS_task-core-misc = "\
     elfutils \
     gettext \
     groff \
@@ -124,7 +124,7 @@ RDEPENDS_task-poky-misc = "\
     zlib \
     "
 
-RDEPENDS_task-poky-lsb-command-add = "\
+RDEPENDS_task-core-lsb-command-add = "\
     localedef \
     fontconfig-utils \
     mailx \
@@ -133,19 +133,19 @@ RDEPENDS_task-poky-lsb-command-add = "\
 "
 #    cups
 
-RDEPENDS_task-poky-lsb-perl-add = "\
+RDEPENDS_task-core-lsb-perl-add = "\
     perl-modules \
     perl-dev \
     perl-misc \
     perl-pod \
 "
 
-RDEPENDS_task-poky-lsb-python-add = "\
+RDEPENDS_task-core-lsb-python-add = "\
     python-modules \
     python-misc \
 "
 
-RDEPENDS_task-poky-lsb-graphic-add = "\
+RDEPENDS_task-core-lsb-graphic-add = "\
     libqtcore4 \
     libqtgui4 \
     libqtsql4 \
@@ -166,19 +166,19 @@ RDEPENDS_task-poky-lsb-graphic-add = "\
     gdk-pixbuf-loader-ani \
 "
 
-RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\
+RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\
     libqtopengl4 \
 "
-RDEPENDS_task-poky-lsb-graphic-add_atom-pc = "\
+RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\
     libqtopengl4 \
 "
-RDEPENDS_task-poky-lsb-graphic-add_qemuppc = "\
+RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\
     libqtopengl4 \
 "
 
 #    mesa-dri 
 
-RDEPENDS_task-poky-lsb-runtime-add = "\
+RDEPENDS_task-core-lsb-runtime-add = "\
     ldd \
     pam-plugin-wheel \
     e2fsprogs-mke2fs \