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/images | |
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/images')
-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 |
12 files changed, 28 insertions, 28 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" | ||