diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 17:25:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-21 00:29:30 +0100 |
commit | 6e95cb246f39e4d49d46761b9a7d51c858ac7e9d (patch) | |
tree | 1646acfdc315d3dfcc2516a6f49509ba7f633fae /meta/recipes-core | |
parent | 4d609d502161137620c4b1901cc225f9e871c3dc (diff) | |
download | poky-6e95cb246f39e4d49d46761b9a7d51c858ac7e9d.tar.gz |
Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/images/core-image-base.bb (renamed from meta/recipes-core/images/poky-image-base.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-core.bb (renamed from meta/recipes-core/images/poky-image-core.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-directdisk.inc (renamed from meta/recipes-core/images/poky-image-directdisk.inc) | 0 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-live.inc (renamed from meta/recipes-core/images/poky-image-live.inc) | 4 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-dev.bb (renamed from meta/recipes-core/images/poky-image-minimal-dev.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-directdisk.bb | 11 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-initramfs.bb (renamed from meta/recipes-core/images/poky-image-minimal-initramfs.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-live.bb | 11 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-mtdutils.bb (renamed from meta/recipes-core/images/poky-image-minimal-mtdutils.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal.bb (renamed from meta/recipes-core/images/poky-image-minimal.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/poky-image-minimal-directdisk.bb | 11 | ||||
-rw-r--r-- | meta/recipes-core/images/poky-image-minimal-live.bb | 11 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-toolchain-gmae.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-boot.bb (renamed from meta/recipes-core/tasks/task-poky-boot.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-nfs.bb (renamed from meta/recipes-core/tasks/task-poky-nfs.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-sdk.bb (renamed from meta/recipes-core/tasks/task-poky-sdk.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-ssh-dropbear.bb (renamed from meta/recipes-core/tasks/task-poky-ssh-dropbear.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-ssh-openssh.bb (renamed from meta/recipes-core/tasks/task-poky-ssh-openssh.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-standalone-sdk-target.bb (renamed from meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-tools.bb (renamed from meta/recipes-core/tasks/task-poky-tools.bb) | 36 |
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 @@ | |||
1 | AUTO_SYSLINUXCFG = "1" | 1 | AUTO_SYSLINUXCFG = "1" |
2 | INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" | 2 | INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz" |
3 | APPEND += "root=/dev/ram0 " | 3 | APPEND += "root=/dev/ram0 " |
4 | TIMEOUT = "10" | 4 | TIMEOUT = "10" |
5 | 5 | ||
@@ -8,7 +8,7 @@ EXCLUDE_FROM_WORLD = "1" | |||
8 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 8 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
9 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 9 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
10 | 10 | ||
11 | do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs" | 11 | do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs" |
12 | 12 | ||
13 | inherit bootimg | 13 | inherit bootimg |
14 | 14 | ||
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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007 OpenedHand Ltd. | 2 | # Copyright (C) 2007 OpenedHand Ltd. |
3 | # | 3 | # |
4 | IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}" | 4 | IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}" |
5 | 5 | ||
6 | IMAGE_FEATURES += "dev-pkgs" | 6 | IMAGE_FEATURES += "dev-pkgs" |
7 | 7 | ||
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 @@ | |||
1 | require core-image-directdisk.inc | ||
2 | |||
3 | DESCRIPTION = "Minimal Bootable Direct Disk Image" | ||
4 | |||
5 | ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3" | ||
6 | |||
7 | LICENSE = "MIT" | ||
8 | |||
9 | do_bootdirectdisk[depends] += "core-image-minimal:do_rootfs" | ||
10 | |||
11 | |||
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 @@ | |||
2 | 2 | ||
3 | IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" | 3 | IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" |
4 | 4 | ||
5 | export IMAGE_BASENAME = "poky-image-minimal-initramfs" | 5 | export IMAGE_BASENAME = "core-image-minimal-initramfs" |
6 | IMAGE_LINGUAS = "" | 6 | IMAGE_LINGUAS = "" |
7 | 7 | ||
8 | LICENSE = "MIT" | 8 | 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 @@ | |||
1 | DESCRIPTION = "Minimal Bootable Live Image" | ||
2 | |||
3 | require core-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3" | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | |||
11 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2008 OpenedHand Ltd. | 2 | # Copyright (C) 2008 OpenedHand Ltd. |
3 | # | 3 | # |
4 | require poky-image-minimal.bb | 4 | require core-image-minimal.bb |
5 | 5 | ||
6 | IMAGE_INSTALL += "mtd-utils" | 6 | 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 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007 OpenedHand Ltd. | 2 | # Copyright (C) 2007 OpenedHand Ltd. |
3 | # | 3 | # |
4 | IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" | 4 | IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" |
5 | 5 | ||
6 | IMAGE_LINGUAS = " " | 6 | IMAGE_LINGUAS = " " |
7 | 7 | ||
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 @@ | |||
1 | require poky-image-directdisk.inc | ||
2 | |||
3 | DESCRIPTION = "Minimal Bootable Direct Disk Image" | ||
4 | |||
5 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" | ||
6 | |||
7 | LICENSE = "MIT" | ||
8 | |||
9 | do_bootdirectdisk[depends] += "poky-image-minimal:do_rootfs" | ||
10 | |||
11 | |||
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 @@ | |||
1 | DESCRIPTION = "Minimal Bootable Live Image" | ||
2 | |||
3 | require poky-image-live.inc | ||
4 | |||
5 | LABELS += "boot install" | ||
6 | |||
7 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" | ||
8 | |||
9 | LICENSE = "MIT" | ||
10 | |||
11 | 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 @@ | |||
1 | TOOLCHAIN_TARGET_GMAETASK ?= "task-poky-standalone-gmae-sdk-target task-poky-standalone-gmae-sdk-target-dbg" | 1 | TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg" |
2 | TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" | 2 | TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" |
3 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" | 3 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" |
4 | PROVIDES = "meta-toolchain-sdk" | 4 | 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" | |||
17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" | 17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" |
18 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | 18 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" |
19 | 19 | ||
20 | RDEPENDS_task-poky-boot = "\ | 20 | RDEPENDS_task-core-boot = "\ |
21 | base-files \ | 21 | base-files \ |
22 | base-passwd \ | 22 | base-passwd \ |
23 | busybox \ | 23 | busybox \ |
@@ -31,5 +31,5 @@ RDEPENDS_task-poky-boot = "\ | |||
31 | ${VIRTUAL-RUNTIME_update-alternatives} \ | 31 | ${VIRTUAL-RUNTIME_update-alternatives} \ |
32 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" | 32 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" |
33 | 33 | ||
34 | RRECOMMENDS_task-poky-boot = "\ | 34 | RRECOMMENDS_task-core-boot = "\ |
35 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" | 35 | ${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 | |||
9 | PR = "r0" | 9 | PR = "r0" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | PACKAGES = "\ |
12 | task-poky-nfs-server \ | 12 | task-core-nfs-server \ |
13 | task-poky-nfs-server-dbg \ | 13 | task-core-nfs-server-dbg \ |
14 | task-poky-nfs-server-dev \ | 14 | task-core-nfs-server-dev \ |
15 | " | 15 | " |
16 | 16 | ||
17 | ALLOW_EMPTY = "1" | 17 | ALLOW_EMPTY = "1" |
18 | 18 | ||
19 | RDEPENDS_task-poky-nfs-server = "\ | 19 | RDEPENDS_task-core-nfs-server = "\ |
20 | nfs-utils" | 20 | nfs-utils" |
21 | 21 | ||
22 | # rpcinfo can be useful but only with glibc images | 22 | # rpcinfo can be useful but only with glibc images |
23 | GLIBC_DEPENDENCIES = "glibc-utils" | 23 | GLIBC_DEPENDENCIES = "glibc-utils" |
24 | 24 | ||
25 | RRECOMMENDS_task-poky-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" | 25 | RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" |
26 | RRECOMMENDS_task-poky-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}" | 26 | 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" | |||
13 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' | 13 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' |
14 | 14 | ||
15 | PACKAGES = "\ | 15 | PACKAGES = "\ |
16 | task-poky-sdk \ | 16 | task-core-sdk \ |
17 | task-poky-sdk-dbg \ | 17 | task-core-sdk-dbg \ |
18 | task-poky-sdk-dev" | 18 | task-core-sdk-dev" |
19 | 19 | ||
20 | RDEPENDS_task-poky-sdk = "\ | 20 | RDEPENDS_task-core-sdk = "\ |
21 | autoconf \ | 21 | autoconf \ |
22 | automake \ | 22 | automake \ |
23 | binutils \ | 23 | binutils \ |
@@ -51,7 +51,7 @@ RDEPENDS_task-poky-sdk = "\ | |||
51 | # poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES'] | 51 | # poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES'] |
52 | # pkgs = bb.data.getVar('PACKAGES', d, 1).split() | 52 | # pkgs = bb.data.getVar('PACKAGES', d, 1).split() |
53 | # for pkg in poky_pkgs.split(): | 53 | # for pkg in poky_pkgs.split(): |
54 | # newpkg = pkg.replace('task-poky', 'task-poky-sdk') | 54 | # newpkg = pkg.replace('task-poky', 'task-core-sdk') |
55 | # | 55 | # |
56 | # # for each of the task packages, add a corresponding sdk task | 56 | # # for each of the task packages, add a corresponding sdk task |
57 | # pkgs.append(newpkg) | 57 | # pkgs.append(newpkg) |
@@ -86,4 +86,4 @@ RDEPENDS_task-poky-sdk = "\ | |||
86 | # bb.data.setVar('PACKAGES', ' '.join(pkgs), d) | 86 | # bb.data.setVar('PACKAGES', ' '.join(pkgs), d) |
87 | #} | 87 | #} |
88 | # | 88 | # |
89 | #PACKAGES_DYNAMIC = "task-poky-sdk-*" | 89 | #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 | |||
5 | PR = "r0" | 5 | PR = "r0" |
6 | 6 | ||
7 | PACKAGES = "\ | 7 | PACKAGES = "\ |
8 | task-poky-ssh-dropbear \ | 8 | task-core-ssh-dropbear \ |
9 | task-poky-ssh-dropbear-dbg \ | 9 | task-core-ssh-dropbear-dbg \ |
10 | task-poky-ssh-dropbear-dev \ | 10 | task-core-ssh-dropbear-dev \ |
11 | " | 11 | " |
12 | 12 | ||
13 | ALLOW_EMPTY = "1" | 13 | ALLOW_EMPTY = "1" |
14 | 14 | ||
15 | RDEPENDS_task-poky-ssh-dropbear = "dropbear" | 15 | RDEPENDS_task-core-ssh-dropbear = "dropbear" |
16 | RDEPENDS_task-poky-ssh-dropbear-dbg = "dropbear-dbg" | 16 | RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg" |
17 | RDEPENDS_task-poky-ssh-dropbear-dev = "dropbear-dev" | 17 | 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 | |||
5 | PR = "r0" | 5 | PR = "r0" |
6 | 6 | ||
7 | PACKAGES = "\ | 7 | PACKAGES = "\ |
8 | task-poky-ssh-openssh \ | 8 | task-core-ssh-openssh \ |
9 | task-poky-ssh-openssh-dbg \ | 9 | task-core-ssh-openssh-dbg \ |
10 | task-poky-ssh-openssh-dev \ | 10 | task-core-ssh-openssh-dev \ |
11 | " | 11 | " |
12 | 12 | ||
13 | ALLOW_EMPTY = "1" | 13 | ALLOW_EMPTY = "1" |
14 | 14 | ||
15 | RDEPENDS_task-poky-ssh-openssh = "openssh" | 15 | RDEPENDS_task-core-ssh-openssh = "openssh" |
16 | RDEPENDS_task-poky-ssh-openssh-dbg = "openssh-dbg" | 16 | RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg" |
17 | RDEPENDS_task-poky-ssh-openssh-dev = "openssh-dev" | 17 | 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 | |||
9 | PR = "r8" | 9 | PR = "r8" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | PACKAGES = "\ |
12 | task-poky-tools-debug \ | 12 | task-core-tools-debug \ |
13 | task-poky-tools-debug-dbg \ | 13 | task-core-tools-debug-dbg \ |
14 | task-poky-tools-debug-dev \ | 14 | task-core-tools-debug-dev \ |
15 | task-poky-tools-profile \ | 15 | task-core-tools-profile \ |
16 | task-poky-tools-profile-dbg \ | 16 | task-core-tools-profile-dbg \ |
17 | task-poky-tools-profile-dev \ | 17 | task-core-tools-profile-dev \ |
18 | task-poky-tools-testapps \ | 18 | task-core-tools-testapps \ |
19 | task-poky-tools-testapps-dbg \ | 19 | task-core-tools-testapps-dbg \ |
20 | task-poky-tools-testapps-dev \ | 20 | task-core-tools-testapps-dev \ |
21 | " | 21 | " |
22 | 22 | ||
23 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 23 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -30,14 +30,14 @@ KEXECTOOLS_mips ?= "" | |||
30 | KEXECTOOLS_mipsel ?= "" | 30 | KEXECTOOLS_mipsel ?= "" |
31 | KEXECTOOLS_powerpc ?= "" | 31 | KEXECTOOLS_powerpc ?= "" |
32 | 32 | ||
33 | RDEPENDS_task-poky-tools-debug = "\ | 33 | RDEPENDS_task-core-tools-debug = "\ |
34 | gdb \ | 34 | gdb \ |
35 | gdbserver \ | 35 | gdbserver \ |
36 | tcf-agent \ | 36 | tcf-agent \ |
37 | rsync \ | 37 | rsync \ |
38 | strace" | 38 | strace" |
39 | 39 | ||
40 | RDEPENDS_task-poky-tools-profile = "\ | 40 | RDEPENDS_task-core-tools-profile = "\ |
41 | oprofile \ | 41 | oprofile \ |
42 | oprofileui-server \ | 42 | oprofileui-server \ |
43 | powertop \ | 43 | powertop \ |
@@ -45,7 +45,7 @@ RDEPENDS_task-poky-tools-profile = "\ | |||
45 | lttng-control \ | 45 | lttng-control \ |
46 | lttng-viewer" | 46 | lttng-viewer" |
47 | 47 | ||
48 | RRECOMMENDS_task-poky-tools-profile = "\ | 48 | RRECOMMENDS_task-core-tools-profile = "\ |
49 | perf \ | 49 | perf \ |
50 | trace-cmd \ | 50 | trace-cmd \ |
51 | kernel-module-oprofile \ | 51 | kernel-module-oprofile \ |
@@ -60,13 +60,13 @@ RRECOMMENDS_task-poky-tools-profile = "\ | |||
60 | # qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu | 60 | # qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu |
61 | # (which is required by lttng-ust) may not build on other platforms, like | 61 | # (which is required by lttng-ust) may not build on other platforms, like |
62 | # MIPS and qemu ARMv5te that poky uses now. | 62 | # MIPS and qemu ARMv5te that poky uses now. |
63 | RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" | 63 | RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" |
64 | RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust systemtap" | 64 | RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap" |
65 | RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust systemtap" | 65 | RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap" |
66 | RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust systemtap" | 66 | RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap" |
67 | RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust systemtap" | 67 | RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap" |
68 | 68 | ||
69 | RDEPENDS_task-poky-tools-testapps = "\ | 69 | RDEPENDS_task-core-tools-testapps = "\ |
70 | blktool \ | 70 | blktool \ |
71 | fstests \ | 71 | fstests \ |
72 | tslib-calibrate \ | 72 | tslib-calibrate \ |