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

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

20 files changed, 73 insertions, 73 deletions

diff --git a/meta/recipes-core/images/poky-image-base.bb b/meta/recipes-core/images/core-image-base.bb
index 461b805b60..461b805b60 100644
--- a/meta/recipes-core/images/poky-image-base.bb
+++ b/meta/recipes-core/images/core-image-base.bb
diff --git a/meta/recipes-core/images/poky-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index c232ccdc54..c232ccdc54 100644
--- a/meta/recipes-core/images/poky-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
diff --git a/meta/recipes-core/images/poky-image-directdisk.inc b/meta/recipes-core/images/core-image-directdisk.inc
index 64144b9abf..64144b9abf 100644
--- a/meta/recipes-core/images/poky-image-directdisk.inc
+++ b/meta/recipes-core/images/core-image-directdisk.inc
diff --git a/meta/recipes-core/images/poky-image-live.inc b/meta/recipes-core/images/core-image-live.inc
index a1b0e1a3dc..2c9b3fb458 100644
--- a/meta/recipes-core/images/poky-image-live.inc
+++ b/meta/recipes-core/images/core-image-live.inc
@@ -1,5 +1,5 @@
 AUTO_SYSLINUXCFG = "1"
-INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
+INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
 APPEND += "root=/dev/ram0 "
 TIMEOUT = "10"
 
@@ -8,7 +8,7 @@ EXCLUDE_FROM_WORLD = "1"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
+do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
 
 inherit bootimg
 
diff --git a/meta/recipes-core/images/poky-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb
index c64b657204..248d29f031 100644
--- a/meta/recipes-core/images/poky-image-minimal-dev.bb
+++ b/meta/recipes-core/images/core-image-minimal-dev.bb
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2007 OpenedHand Ltd.
 #
-IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}"
 
 IMAGE_FEATURES += "dev-pkgs"
 
diff --git a/meta/recipes-core/images/core-image-minimal-directdisk.bb b/meta/recipes-core/images/core-image-minimal-directdisk.bb
new file mode 100644
index 0000000000..ed23e45708
--- /dev/null
+++ b/meta/recipes-core/images/core-image-minimal-directdisk.bb
@@ -0,0 +1,11 @@
+require core-image-directdisk.inc
+
+DESCRIPTION = "Minimal Bootable Direct Disk Image"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3"
+
+LICENSE = "MIT"
+
+do_bootdirectdisk[depends] += "core-image-minimal:do_rootfs"
+
+
diff --git a/meta/recipes-core/images/poky-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index a94e71218f..3da4a952f7 100644
--- a/meta/recipes-core/images/poky-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -2,7 +2,7 @@
 
 IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd"
 
-export IMAGE_BASENAME = "poky-image-minimal-initramfs"
+export IMAGE_BASENAME = "core-image-minimal-initramfs"
 IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"
diff --git a/meta/recipes-core/images/core-image-minimal-live.bb b/meta/recipes-core/images/core-image-minimal-live.bb
new file mode 100644
index 0000000000..0ce2afb2e8
--- /dev/null
+++ b/meta/recipes-core/images/core-image-minimal-live.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Minimal Bootable Live Image"
+
+require core-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3"
+
+LICENSE = "MIT"
+
+do_bootimg[depends] += "core-image-minimal:do_rootfs"
diff --git a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb b/meta/recipes-core/images/core-image-minimal-mtdutils.bb
index d786131d98..adabaa400a 100644
--- a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb
+++ b/meta/recipes-core/images/core-image-minimal-mtdutils.bb
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008 OpenedHand Ltd.
 #
-require poky-image-minimal.bb
+require core-image-minimal.bb
 
 IMAGE_INSTALL += "mtd-utils"
diff --git a/meta/recipes-core/images/poky-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 6a641f3b84..3aae04edde 100644
--- a/meta/recipes-core/images/poky-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2007 OpenedHand Ltd.
 #
-IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}"
 
 IMAGE_LINGUAS = " "
 
diff --git a/meta/recipes-core/images/poky-image-minimal-directdisk.bb b/meta/recipes-core/images/poky-image-minimal-directdisk.bb
deleted file mode 100644
index 18d993e542..0000000000
--- a/meta/recipes-core/images/poky-image-minimal-directdisk.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require poky-image-directdisk.inc
-
-DESCRIPTION = "Minimal Bootable Direct Disk Image"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootdirectdisk[depends] += "poky-image-minimal:do_rootfs"
-
-
diff --git a/meta/recipes-core/images/poky-image-minimal-live.bb b/meta/recipes-core/images/poky-image-minimal-live.bb
deleted file mode 100644
index f3d3638ee6..0000000000
--- a/meta/recipes-core/images/poky-image-minimal-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Minimal Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "poky-image-minimal:do_rootfs"
diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb
index 595aba3030..4f5501e0a5 100644
--- a/meta/recipes-core/meta/meta-toolchain-gmae.bb
+++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb
@@ -1,4 +1,4 @@
-TOOLCHAIN_TARGET_GMAETASK ?= "task-poky-standalone-gmae-sdk-target task-poky-standalone-gmae-sdk-target-dbg"
+TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}"
 PROVIDES = "meta-toolchain-sdk"
diff --git a/meta/recipes-core/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 7166761ce4..5aea77169f 100644
--- a/meta/recipes-core/tasks/task-poky-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -17,7 +17,7 @@ PR = "r7"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
-RDEPENDS_task-poky-boot = "\
+RDEPENDS_task-core-boot = "\
     base-files \
     base-passwd \
     busybox \
@@ -31,5 +31,5 @@ RDEPENDS_task-poky-boot = "\
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
-RRECOMMENDS_task-poky-boot = "\
+RRECOMMENDS_task-core-boot = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta/recipes-core/tasks/task-poky-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
index a18d2e3ab8..d5d8291f76 100644
--- a/meta/recipes-core/tasks/task-poky-nfs.bb
+++ b/meta/recipes-core/tasks/task-core-nfs.bb
@@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r0"
 
 PACKAGES = "\
-    task-poky-nfs-server \
-    task-poky-nfs-server-dbg \
-    task-poky-nfs-server-dev \
+    task-core-nfs-server \
+    task-core-nfs-server-dbg \
+    task-core-nfs-server-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-poky-nfs-server = "\
+RDEPENDS_task-core-nfs-server = "\
     nfs-utils"
 
 # rpcinfo can be useful but only with glibc images
 GLIBC_DEPENDENCIES = "glibc-utils"
 
-RRECOMMENDS_task-poky-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
-RRECOMMENDS_task-poky-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
diff --git a/meta/recipes-core/tasks/task-poky-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb
index b1e52c96ca..a158509b2d 100644
--- a/meta/recipes-core/tasks/task-poky-sdk.bb
+++ b/meta/recipes-core/tasks/task-core-sdk.bb
@@ -13,11 +13,11 @@ ALLOW_EMPTY = "1"
 #PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
 PACKAGES = "\
-    task-poky-sdk \
-    task-poky-sdk-dbg \
-    task-poky-sdk-dev"
+    task-core-sdk \
+    task-core-sdk-dbg \
+    task-core-sdk-dev"
 
-RDEPENDS_task-poky-sdk = "\
+RDEPENDS_task-core-sdk = "\
     autoconf \
     automake \
     binutils \
@@ -51,7 +51,7 @@ RDEPENDS_task-poky-sdk = "\
 #    poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES']
 #    pkgs = bb.data.getVar('PACKAGES', d, 1).split()
 #    for pkg in poky_pkgs.split():
-#        newpkg = pkg.replace('task-poky', 'task-poky-sdk')
+#        newpkg = pkg.replace('task-poky', 'task-core-sdk')
 #
 #        # for each of the task packages, add a corresponding sdk task
 #        pkgs.append(newpkg)
@@ -86,4 +86,4 @@ RDEPENDS_task-poky-sdk = "\
 #    bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
 #}
 #
-#PACKAGES_DYNAMIC = "task-poky-sdk-*"
+#PACKAGES_DYNAMIC = "task-core-sdk-*"
diff --git a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb
index 4f2ab4425d..1e7402e11f 100644
--- a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb
+++ b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r0"
 
 PACKAGES = "\
-    task-poky-ssh-dropbear \
-    task-poky-ssh-dropbear-dbg \
-    task-poky-ssh-dropbear-dev \
+    task-core-ssh-dropbear \
+    task-core-ssh-dropbear-dbg \
+    task-core-ssh-dropbear-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-poky-ssh-dropbear = "dropbear"
-RDEPENDS_task-poky-ssh-dropbear-dbg = "dropbear-dbg"
-RDEPENDS_task-poky-ssh-dropbear-dev = "dropbear-dev"
+RDEPENDS_task-core-ssh-dropbear = "dropbear"
+RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg"
+RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev"
diff --git a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb b/meta/recipes-core/tasks/task-core-ssh-openssh.bb
index 5f828b55b9..794399a2b8 100644
--- a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb
+++ b/meta/recipes-core/tasks/task-core-ssh-openssh.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r0"
 
 PACKAGES = "\
-    task-poky-ssh-openssh \
-    task-poky-ssh-openssh-dbg \
-    task-poky-ssh-openssh-dev \
+    task-core-ssh-openssh \
+    task-core-ssh-openssh-dbg \
+    task-core-ssh-openssh-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-poky-ssh-openssh = "openssh"
-RDEPENDS_task-poky-ssh-openssh-dbg = "openssh-dbg"
-RDEPENDS_task-poky-ssh-openssh-dev = "openssh-dev"
+RDEPENDS_task-core-ssh-openssh = "openssh"
+RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg"
+RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev"
diff --git a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb
index 3835ac7d6a..3835ac7d6a 100644
--- a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb
+++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb
diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
index 29f5d4afa1..958dff12a0 100644
--- a/meta/recipes-core/tasks/task-poky-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PR = "r8"
 
 PACKAGES = "\
-    task-poky-tools-debug \
-    task-poky-tools-debug-dbg \
-    task-poky-tools-debug-dev \
-    task-poky-tools-profile \
-    task-poky-tools-profile-dbg \
-    task-poky-tools-profile-dev \
-    task-poky-tools-testapps \
-    task-poky-tools-testapps-dbg \
-    task-poky-tools-testapps-dev \
+    task-core-tools-debug \
+    task-core-tools-debug-dbg \
+    task-core-tools-debug-dev \
+    task-core-tools-profile \
+    task-core-tools-profile-dbg \
+    task-core-tools-profile-dev \
+    task-core-tools-testapps \
+    task-core-tools-testapps-dbg \
+    task-core-tools-testapps-dev \
     "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -30,14 +30,14 @@ KEXECTOOLS_mips ?= ""
 KEXECTOOLS_mipsel ?= ""
 KEXECTOOLS_powerpc ?= ""
 
-RDEPENDS_task-poky-tools-debug = "\
+RDEPENDS_task-core-tools-debug = "\
     gdb \
     gdbserver \
     tcf-agent \
     rsync \
     strace"
 
-RDEPENDS_task-poky-tools-profile = "\
+RDEPENDS_task-core-tools-profile = "\
     oprofile \
     oprofileui-server \
     powertop \
@@ -45,7 +45,7 @@ RDEPENDS_task-poky-tools-profile = "\
     lttng-control \
     lttng-viewer"
 
-RRECOMMENDS_task-poky-tools-profile = "\
+RRECOMMENDS_task-core-tools-profile = "\
     perf \
     trace-cmd \
     kernel-module-oprofile \
@@ -60,13 +60,13 @@ RRECOMMENDS_task-poky-tools-profile = "\
 # qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu
 # (which is required by lttng-ust) may not build on other platforms, like
 # MIPS and qemu ARMv5te that poky uses now.
-RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap"
-RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust systemtap"
-RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust systemtap"
-RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust systemtap"
-RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust systemtap"
+RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap"
+RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap"
+RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap"
+RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap"
+RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap"
 
-RDEPENDS_task-poky-tools-testapps = "\
+RDEPENDS_task-core-tools-testapps = "\
     blktool \
     fstests \
     tslib-calibrate \