summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.hardware20
-rw-r--r--meta-rt/images/core-image-minimal-rt-directdisk.bb15
-rw-r--r--meta-rt/images/core-image-minimal-rt-live.bb15
-rw-r--r--meta-rt/images/core-image-minimal-rt.bb (renamed from meta-rt/images/poky-image-minimal-rt.bb)2
-rw-r--r--meta-rt/images/poky-image-minimal-rt-directdisk.bb15
-rw-r--r--meta-rt/images/poky-image-minimal-rt-live.bb15
-rw-r--r--meta/classes/poky-image.bbclass94
-rw-r--r--meta/classes/populate_sdk.bbclass2
-rw-r--r--meta/conf/distro/include/distro_tracking_fields.inc268
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb2
-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.bb11
-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.bb11
-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.bb11
-rw-r--r--meta/recipes-core/images/poky-image-minimal-live.bb11
-rw-r--r--meta/recipes-core/meta/meta-toolchain-gmae.bb2
-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
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer4
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb (renamed from meta/recipes-extended/images/poky-image-basic.bb)4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb (renamed from meta/recipes-extended/images/poky-image-lsb-dev.bb)4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-live.bb11
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk-live.bb11
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb (renamed from meta/recipes-extended/images/poky-image-lsb-sdk.bb)4
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb (renamed from meta/recipes-extended/images/poky-image-lsb.bb)4
-rw-r--r--meta/recipes-extended/images/poky-image-lsb-live.bb11
-rw-r--r--meta/recipes-extended/images/poky-image-lsb-sdk-live.bb11
-rw-r--r--meta/recipes-extended/libzypp/libzypp/config-release.patch4
-rw-r--r--meta/recipes-extended/tasks/task-core-basic.bb (renamed from meta/recipes-extended/tasks/task-poky-basic.bb)94
-rw-r--r--meta/recipes-extended/tasks/task-core-lsb.bb (renamed from meta/recipes-extended/tasks/task-poky-lsb.bb)100
-rw-r--r--meta/recipes-gnome/tasks/task-core-sdk-gmae.bb (renamed from meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb)2
-rw-r--r--meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb (renamed from meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb)2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch2
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb (renamed from meta/recipes-graphics/images/poky-image-clutter.bb)6
-rw-r--r--meta/recipes-graphics/tasks/task-core-clutter.bb (renamed from meta/recipes-graphics/tasks/task-poky-clutter.bb)24
-rw-r--r--meta/recipes-qt/tasks/task-core-qt.bb (renamed from meta/recipes-qt/tasks/task-poky-qt.bb)8
-rw-r--r--meta/recipes-qt/tasks/task-qte-toolchain-target.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato-dev.bb (renamed from meta/recipes-sato/images/poky-image-sato-dev.bb)0
-rw-r--r--meta/recipes-sato/images/core-image-sato-directdisk.bb9
-rw-r--r--meta/recipes-sato/images/core-image-sato-live.bb11
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb9
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk-live.bb11
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb (renamed from meta/recipes-sato/images/poky-image-sato-sdk.bb)0
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb (renamed from meta/recipes-sato/images/poky-image-sato.bb)0
-rw-r--r--meta/recipes-sato/images/poky-image-sato-directdisk.bb9
-rw-r--r--meta/recipes-sato/images/poky-image-sato-live.bb11
-rw-r--r--meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb9
-rw-r--r--meta/recipes-sato/images/poky-image-sato-sdk-live.bb11
-rw-r--r--meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb (renamed from meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb)8
-rw-r--r--meta/recipes-sato/tasks/task-core-x11-sato.bb (renamed from meta/recipes-sato/tasks/task-poky-x11-sato.bb)8
-rw-r--r--meta/recipes-sato/tasks/task-core.bb (renamed from meta/recipes-sato/tasks/task-poky.bb)32
-rwxr-xr-xscripts/creat-lsb-image34
-rwxr-xr-xscripts/poky-setup-builddir4
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb (renamed from scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal (renamed from scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-sato (renamed from scripts/qemuimage-tests/scenario/qemux86/poky-image-sato)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-lsb (renamed from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-minimal (renamed from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-sato (renamed from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb (renamed from scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal (renamed from scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-sato (renamed from scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb (renamed from scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal (renamed from scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato (renamed from scripts/qemuimage-tests/scenario/qemumips/poky-image-sato)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-lsb (renamed from scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-minimal (renamed from scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-sato (renamed from scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato)0
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk)0
-rwxr-xr-xscripts/runqemu18
-rw-r--r--scripts/runqemu.README2
89 files changed, 546 insertions, 546 deletions
diff --git a/README.hardware b/README.hardware
index b2ce146..b895f8f 100644
--- a/README.hardware
+++ b/README.hardware
@@ -87,22 +87,22 @@ Hard Disk:
87 1. Build a directdisk image format. This will generate proper partition tables 87 1. Build a directdisk image format. This will generate proper partition tables
88 that will in turn be written to the physical media. For example: 88 that will in turn be written to the physical media. For example:
89 89
90 $ bitbake poky-image-minimal-directdisk 90 $ bitbake core-image-minimal-directdisk
91 91
92 2. Use the "dd" utility to write the image to the raw block device. For example: 92 2. Use the "dd" utility to write the image to the raw block device. For example:
93 93
94 # dd if=poky-image-minimal-directdisk-atom-pc.hdddirect of=/dev/sdb 94 # dd if=core-image-minimal-directdisk-atom-pc.hdddirect of=/dev/sdb
95 95
96USB Device: 96USB Device:
97 1. Build an hddimg image format. This is a simple filesystem without partition 97 1. Build an hddimg image format. This is a simple filesystem without partition
98 tables and is suitable for USB keys. For example: 98 tables and is suitable for USB keys. For example:
99 99
100 $ bitbake poky-image-minimal-live 100 $ bitbake core-image-minimal-live
101 101
102 2. Use the "dd" utility to write the image to the raw block device. For 102 2. Use the "dd" utility to write the image to the raw block device. For
103 example: 103 example:
104 104
105 # dd if=poky-image-minimal-live-atom-pc.hddimg of=/dev/sdb 105 # dd if=core-image-minimal-live-atom-pc.hddimg of=/dev/sdb
106 106
107 If the device fails to boot with "Boot error" displayed, it is likely the BIOS 107 If the device fails to boot with "Boot error" displayed, it is likely the BIOS
108 cannot understand the physical layout of the disk (or rather it expects a 108 cannot understand the physical layout of the disk (or rather it expects a
@@ -126,7 +126,7 @@ USB Device:
126 126
127 b. Copy the contents of the poky image to the USB-ZIP mode device: 127 b. Copy the contents of the poky image to the USB-ZIP mode device:
128 128
129 # mount -o loop poky-image-minimal-live-atom-pc.hddimg /tmp/image 129 # mount -o loop core-image-minimal-live-atom-pc.hddimg /tmp/image
130 # mount /dev/sdb4 /tmp/usbkey 130 # mount /dev/sdb4 /tmp/usbkey
131 # cp -rf /tmp/image/* /tmp/usbkey 131 # cp -rf /tmp/image/* /tmp/usbkey
132 132
@@ -185,7 +185,7 @@ and may require modification of the NAND environment.
185 # cp u-boot-beagleboard.bin /media/boot/u-boot.bin 185 # cp u-boot-beagleboard.bin /media/boot/u-boot.bin
186 186
187 3. Install the root filesystem 187 3. Install the root filesystem
188 # tar x -C /media/root -f poky-image-$IMAGE_TYPE-beagleboard.tar.bz2 188 # tar x -C /media/root -f core-image-$IMAGE_TYPE-beagleboard.tar.bz2
189 # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz 189 # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz
190 190
191 4. Install the kernel uImage 191 4. Install the kernel uImage
@@ -279,11 +279,11 @@ name in all commands where appropriate.
279 279
280--- Preparation --- 280--- Preparation ---
281 281
2821) Build an image (e.g. poky-image-minimal) using "routerstationpro" as the 2821) Build an image (e.g. core-image-minimal) using "routerstationpro" as the
283MACHINE 283MACHINE
284 284
2852) Partition the USB drive so that primary partition 1 is type Linux (83). 2852) Partition the USB drive so that primary partition 1 is type Linux (83).
286Minimum size depends on your root image size - poky-image-minimal probably 286Minimum size depends on your root image size - core-image-minimal probably
287only needs 8-16MB, other images will need more. 287only needs 8-16MB, other images will need more.
288 288
289 # fdisk /dev/sdb 289 # fdisk /dev/sdb
@@ -304,11 +304,11 @@ only needs 8-16MB, other images will need more.
304 # mke2fs -j /dev/sdb1 304 # mke2fs -j /dev/sdb1
305 305
3064) Mount partition 1 and then extract the contents of 3064) Mount partition 1 and then extract the contents of
307tmp/deploy/images/poky-image-XXXX.tar.bz2 into it (preserving permissions). 307tmp/deploy/images/core-image-XXXX.tar.bz2 into it (preserving permissions).
308 308
309 # mount /dev/sdb1 /media/sdb1 309 # mount /dev/sdb1 /media/sdb1
310 # cd /media/sdb1 310 # cd /media/sdb1
311 # tar -xvjpf tmp/deploy/images/poky-image-XXXX.tar.bz2 311 # tar -xvjpf tmp/deploy/images/core-image-XXXX.tar.bz2
312 312
3135) Unmount the USB drive and then plug it into the board's USB port 3135) Unmount the USB drive and then plug it into the board's USB port
314 314
diff --git a/meta-rt/images/core-image-minimal-rt-directdisk.bb b/meta-rt/images/core-image-minimal-rt-directdisk.bb
new file mode 100644
index 0000000..b3f3523
--- /dev/null
+++ b/meta-rt/images/core-image-minimal-rt-directdisk.bb
@@ -0,0 +1,15 @@
1#
2# Copyright (C) 2010 Intel Corporation.
3#
4
5require recipes-core/images/core-image-directdisk.inc
6
7DESCRIPTION = "Bootable Minimal Real-Time Direct Disk Image"
8
9ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-rt-${MACHINE}.ext3"
10
11LICENSE = "MIT"
12
13do_bootdirectdisk[depends] += "core-image-minimal-rt:do_rootfs"
14
15
diff --git a/meta-rt/images/core-image-minimal-rt-live.bb b/meta-rt/images/core-image-minimal-rt-live.bb
new file mode 100644
index 0000000..9e0fdba
--- /dev/null
+++ b/meta-rt/images/core-image-minimal-rt-live.bb
@@ -0,0 +1,15 @@
1#
2# Copyright (C) 2010 Intel Corporation.
3#
4
5DESCRIPTION = "Bootable Live Minimal Real-Time Linux Image"
6
7require recipes-core/images/core-image-live.inc
8
9LABELS += "boot install"
10
11ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-rt-${MACHINE}.ext3"
12
13LICENSE = "MIT"
14
15do_bootimg[depends] += "core-image-minimal-rt:do_rootfs"
diff --git a/meta-rt/images/poky-image-minimal-rt.bb b/meta-rt/images/core-image-minimal-rt.bb
index 6f5700c..32a9b92 100644
--- a/meta-rt/images/poky-image-minimal-rt.bb
+++ b/meta-rt/images/core-image-minimal-rt.bb
@@ -5,7 +5,7 @@
5DESCRIPTION = "Minimal Real-Time Linux Image" 5DESCRIPTION = "Minimal Real-Time Linux Image"
6DEPENDS = "linux-yocto-rt" 6DEPENDS = "linux-yocto-rt"
7 7
8require recipes-core/images/poky-image-minimal.bb 8require recipes-core/images/core-image-minimal.bb
9 9
10IMAGE_INSTALL += "rt-tests" 10IMAGE_INSTALL += "rt-tests"
11 11
diff --git a/meta-rt/images/poky-image-minimal-rt-directdisk.bb b/meta-rt/images/poky-image-minimal-rt-directdisk.bb
deleted file mode 100644
index b68fe56..0000000
--- a/meta-rt/images/poky-image-minimal-rt-directdisk.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation.
3#
4
5require recipes-core/images/poky-image-directdisk.inc
6
7DESCRIPTION = "Bootable Minimal Real-Time Direct Disk Image"
8
9ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-rt-${MACHINE}.ext3"
10
11LICENSE = "MIT"
12
13do_bootdirectdisk[depends] += "poky-image-minimal-rt:do_rootfs"
14
15
diff --git a/meta-rt/images/poky-image-minimal-rt-live.bb b/meta-rt/images/poky-image-minimal-rt-live.bb
deleted file mode 100644
index 01628dc..0000000
--- a/meta-rt/images/poky-image-minimal-rt-live.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation.
3#
4
5DESCRIPTION = "Bootable Live Minimal Real-Time Linux Image"
6
7require recipes-core/images/poky-image-live.inc
8
9LABELS += "boot install"
10
11ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-rt-${MACHINE}.ext3"
12
13LICENSE = "MIT"
14
15do_bootimg[depends] += "poky-image-minimal-rt:do_rootfs"
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 54cf57f..832319a 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
7 7
8# IMAGE_FEATURES control content of images built with Poky. 8# IMAGE_FEATURES control content of images built with Poky.
9# 9#
10# By default we install task-poky-boot and task-base packages - this gives us 10# By default we install task-core-boot and task-base packages - this gives us
11# working (console only) rootfs. 11# working (console only) rootfs.
12# 12#
13# Available IMAGE_FEATURES: 13# Available IMAGE_FEATURES:
@@ -31,68 +31,68 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
31# 31#
32 32
33POKY_BASE_INSTALL = '\ 33POKY_BASE_INSTALL = '\
34 task-poky-boot \ 34 task-core-boot \
35 task-base-extended \ 35 task-base-extended \
36 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \ 36 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \
37 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \ 37 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \
38 \ 38 \
39 ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-poky-apps-console", "",d)} \ 39 ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \
40 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-poky-apps-console-dbg", "",d)} \ 40 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \
41 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-poky-apps-console-dev", "",d)} \ 41 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \
42 \ 42 \
43 ${@base_contains("IMAGE_FEATURES", "x11-base", "task-poky-x11-base", "",d)} \ 43 ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \
44 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-poky-x11-base-dbg", "",d)} \ 44 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \
45 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-poky-x11-base-dev", "",d)} \ 45 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \
46 \ 46 \
47 ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-poky-x11-sato", "",d)} \ 47 ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \
48 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \ 48 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \
49 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \ 49 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \
50 \ 50 \
51 ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-poky-x11-netbook", "", d)} \ 51 ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \
52 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-poky-x11-netbook-dbg", "", d)} \ 52 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \
53 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-poky-x11-netbook-dev", "", d)} \ 53 ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \
54 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \ 54 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \
55 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \ 55 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \
56 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \ 56 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \
57 \ 57 \
58 ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-poky-apps-x11-games", "",d)} \ 58 ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \
59 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-poky-apps-x11-games-dbg", "",d)} \ 59 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \
60 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-poky-apps-x11-games-dev", "",d)} \ 60 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \
61 \ 61 \
62 ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-poky-apps-x11-pimlico", "",d)} \ 62 ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \
63 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-poky-apps-x11-pimlico-dbg", "",d)} \ 63 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \
64 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-poky-apps-x11-pimlico-dev", "",d)} \ 64 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \
65 \ 65 \
66 ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-poky-tools-debug", "",d)} \ 66 ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \
67 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-poky-tools-debug-dbg", "",d)} \ 67 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \
68 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-poky-tools-debug-dev", "",d)} \ 68 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \
69 \ 69 \
70 ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-poky-tools-profile", "",d)} \ 70 ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \
71 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-poky-tools-profile-dbg", "",d)} \ 71 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \
72 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-poky-tools-profile-dev", "",d)} \ 72 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \
73 \ 73 \
74 ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-poky-tools-testapps", "",d)} \ 74 ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \
75 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-poky-tools-testapps-dbg", "",d)} \ 75 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \
76 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-poky-tools-testapps-dev", "",d)} \ 76 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \
77 \ 77 \
78 ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-poky-sdk task-poky-standalone-sdk-target", "",d)} \ 78 ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \
79 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \ 79 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \
80 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \ 80 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \
81 \ 81 \
82 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ 82 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \
83 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ 83 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \
84 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ 84 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \
85 \ 85 \
86 ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-poky-ssh-dropbear", "",d)} \ 86 ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \
87 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-poky-ssh-dropbear-dbg", "",d)} \ 87 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \
88 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-poky-ssh-dropbear-dev", "",d)} \ 88 ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \
89 \ 89 \
90 ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-poky-ssh-openssh", "",d)} \ 90 ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \
91 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-poky-ssh-openssh-dbg", "",d)} \ 91 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \
92 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-poky-ssh-openssh-dev", "",d)} \ 92 ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \
93 \ 93 \
94 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ 94 ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
95 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \ 95 ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \
96 ${POKY_EXTRA_INSTALL} \ 96 ${POKY_EXTRA_INSTALL} \
97 ' 97 '
98 98
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 474b43b..413eb52 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -8,7 +8,7 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
8SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" 8SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
9 9
10TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 10TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
11TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" 11TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
12TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" 12TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
13 13
14RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" 14RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 542b865..ebc43f5 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2283,34 +2283,34 @@ RECIPE_LATEST_RELEASE_DATE_pn-task-base="n/a"
2283RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-base="n/a" 2283RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-base="n/a"
2284RECIPE_MAINTAINER_pn-task-base = "Dongxiao Xu <dongxiao.xu@intel.com>" 2284RECIPE_MAINTAINER_pn-task-base = "Dongxiao Xu <dongxiao.xu@intel.com>"
2285 2285
2286RECIPE_STATUS_pn-task-poky-clutter="green" 2286RECIPE_STATUS_pn-task-core-clutter="green"
2287RECIPE_LATEST_VERSION_pn-task-poky-clutter="1.0" 2287RECIPE_LATEST_VERSION_pn-task-core-clutter="1.0"
2288RECIPE_NO_OF_PATCHES_pn-task-poky-clutter="0" 2288RECIPE_NO_OF_PATCHES_pn-task-core-clutter="0"
2289RECIPE_LATEST_RELEASE_DATE_pn-task-poky-clutter="n/a" 2289RECIPE_LATEST_RELEASE_DATE_pn-task-core-clutter="n/a"
2290RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-clutter="n/a" 2290RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-clutter="n/a"
2291RECIPE_MAINTAINER_pn-task-poky-clutter = "Dongxiao Xu <dongxiao.xu@intel.com>" 2291RECIPE_MAINTAINER_pn-task-core-clutter = "Dongxiao Xu <dongxiao.xu@intel.com>"
2292DISTRO_PN_ALIAS_pn-task-poky-clutter = "Poky" 2292DISTRO_PN_ALIAS_pn-task-core-clutter = "Poky"
2293 2293
2294RECIPE_STATUS_pn-task-poky-boot="green" 2294RECIPE_STATUS_pn-task-core-boot="green"
2295RECIPE_LATEST_VERSION_pn-task-poky-boot="1.0" 2295RECIPE_LATEST_VERSION_pn-task-core-boot="1.0"
2296RECIPE_NO_OF_PATCHES_pn-task-poky-boot="0" 2296RECIPE_NO_OF_PATCHES_pn-task-core-boot="0"
2297RECIPE_LATEST_RELEASE_DATE_pn-task-poky-boot="n/a" 2297RECIPE_LATEST_RELEASE_DATE_pn-task-core-boot="n/a"
2298RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-boot="n/a" 2298RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-boot="n/a"
2299RECIPE_MAINTAINER_pn-task-poky-boot = "Dongxiao Xu <dongxiao.xu@intel.com>" 2299RECIPE_MAINTAINER_pn-task-core-boot = "Dongxiao Xu <dongxiao.xu@intel.com>"
2300 2300
2301RECIPE_STATUS_pn-task-poky-nfs="green" 2301RECIPE_STATUS_pn-task-core-nfs="green"
2302RECIPE_LATEST_VERSION_pn-task-poky-nfs="1.0" 2302RECIPE_LATEST_VERSION_pn-task-core-nfs="1.0"
2303RECIPE_NO_OF_PATCHES_pn-task-poky-nfs="0" 2303RECIPE_NO_OF_PATCHES_pn-task-core-nfs="0"
2304RECIPE_LATEST_RELEASE_DATE_pn-task-poky-nfs="n/a" 2304RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a"
2305RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-nfs="n/a" 2305RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a"
2306RECIPE_MAINTAINER_pn-task-poky-nfs = "Dongxiao Xu <dongxiao.xu@intel.com>" 2306RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu <dongxiao.xu@intel.com>"
2307 2307
2308RECIPE_STATUS_pn-task-poky-tools="green" 2308RECIPE_STATUS_pn-task-core-tools="green"
2309RECIPE_LATEST_VERSION_pn-task-poky-tools="1.0" 2309RECIPE_LATEST_VERSION_pn-task-core-tools="1.0"
2310RECIPE_NO_OF_PATCHES_pn-task-poky-tools="0" 2310RECIPE_NO_OF_PATCHES_pn-task-core-tools="0"
2311RECIPE_LATEST_RELEASE_DATE_pn-task-poky-tools="n/a" 2311RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a"
2312RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-tools="n/a" 2312RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a"
2313RECIPE_MAINTAINER_pn-task-poky-tools = "Dongxiao Xu <dongxiao.xu@intel.com>" 2313RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao Xu <dongxiao.xu@intel.com>"
2314 2314
2315RECIPE_STATUS_pn-gst-meta-base="green" 2315RECIPE_STATUS_pn-gst-meta-base="green"
2316DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10" 2316DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10"
@@ -2320,19 +2320,19 @@ RECIPE_LATEST_RELEASE_DATE_pn-gst-meta-base="n/a"
2320RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-meta-base="n/a" 2320RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-meta-base="n/a"
2321RECIPE_MAINTAINER_pn-gst-meta-base = "Dongxiao Xu <dongxiao.xu@intel.com>" 2321RECIPE_MAINTAINER_pn-gst-meta-base = "Dongxiao Xu <dongxiao.xu@intel.com>"
2322 2322
2323RECIPE_STATUS_pn-task-poky-apps-x11-pimlico="green" 2323RECIPE_STATUS_pn-task-core-apps-x11-pimlico="green"
2324RECIPE_LATEST_VERSION_pn-task-poky-apps-x11-pimlico="1.0" 2324RECIPE_LATEST_VERSION_pn-task-core-apps-x11-pimlico="1.0"
2325RECIPE_NO_OF_PATCHES_pn-task-poky-apps-x11-pimlico="0" 2325RECIPE_NO_OF_PATCHES_pn-task-core-apps-x11-pimlico="0"
2326RECIPE_LATEST_RELEASE_DATE_pn-task-poky-apps-x11-pimlico="n/a" 2326RECIPE_LATEST_RELEASE_DATE_pn-task-core-apps-x11-pimlico="n/a"
2327RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-apps-x11-pimlico="n/a" 2327RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-apps-x11-pimlico="n/a"
2328RECIPE_MAINTAINER_pn-task-poky-apps-x11-pimlico = "Dongxiao Xu <dongxiao.xu@intel.com>" 2328RECIPE_MAINTAINER_pn-task-core-apps-x11-pimlico = "Dongxiao Xu <dongxiao.xu@intel.com>"
2329 2329
2330RECIPE_STATUS_pn-task-poky-x11-sato="green" 2330RECIPE_STATUS_pn-task-core-x11-sato="green"
2331RECIPE_LATEST_VERSION_pn-task-poky-x11-sato="1.0" 2331RECIPE_LATEST_VERSION_pn-task-core-x11-sato="1.0"
2332RECIPE_NO_OF_PATCHES_pn-task-poky-x11-sato="0" 2332RECIPE_NO_OF_PATCHES_pn-task-core-x11-sato="0"
2333RECIPE_LATEST_RELEASE_DATE_pn-task-poky-x11-sato="n/a" 2333RECIPE_LATEST_RELEASE_DATE_pn-task-core-x11-sato="n/a"
2334RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-x11-sato="n/a" 2334RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-x11-sato="n/a"
2335RECIPE_MAINTAINER_pn-task-poky-x11-sato = "Dongxiao Xu <dongxiao.xu@intel.com>" 2335RECIPE_MAINTAINER_pn-task-core-x11-sato = "Dongxiao Xu <dongxiao.xu@intel.com>"
2336 2336
2337RECIPE_STATUS_pn-enchant="green" 2337RECIPE_STATUS_pn-enchant="green"
2338RECIPE_LATEST_VERSION_pn-enchant="1.6.0" 2338RECIPE_LATEST_VERSION_pn-enchant="1.6.0"
@@ -2342,21 +2342,21 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-enchant="10 months"
2342RECIPE_LAST_UPDATE_pn-enchant = "Aug 4, 2010" 2342RECIPE_LAST_UPDATE_pn-enchant = "Aug 4, 2010"
2343RECIPE_MAINTAINER_pn-enchant = "Dongxiao Xu <dongxiao.xu@intel.com>" 2343RECIPE_MAINTAINER_pn-enchant = "Dongxiao Xu <dongxiao.xu@intel.com>"
2344 2344
2345RECIPE_STATUS_pn-task-poky-sdk = "red" 2345RECIPE_STATUS_pn-task-core-sdk = "red"
2346RECIPE_LATEST_VERSION_pn-task-poky-sdk = "1.0" 2346RECIPE_LATEST_VERSION_pn-task-core-sdk = "1.0"
2347RECIPE_MAINTAINER_pn-task-poky-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>" 2347RECIPE_MAINTAINER_pn-task-core-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>"
2348 2348
2349RECIPE_STATUS_pn-task-poky-sdk-gmae = "red" 2349RECIPE_STATUS_pn-task-core-sdk-gmae = "red"
2350RECIPE_LATEST_VERSION_pn-task-poky-sdk-gmae = "1.0" 2350RECIPE_LATEST_VERSION_pn-task-core-sdk-gmae = "1.0"
2351RECIPE_MAINTAINER_pn-task-poky-sdk-gmae = "Dongxiao Xu <dongxiao.xu@intel.com>" 2351RECIPE_MAINTAINER_pn-task-core-sdk-gmae = "Dongxiao Xu <dongxiao.xu@intel.com>"
2352 2352
2353RECIPE_STATUS_pn-task-poky-standalone-gmae-sdk-target = "red" 2353RECIPE_STATUS_pn-task-core-standalone-gmae-sdk-target = "red"
2354RECIPE_LATEST_VERSION_pn-task-poky-standalone-gmae-sdk-target = "1.0" 2354RECIPE_LATEST_VERSION_pn-task-core-standalone-gmae-sdk-target = "1.0"
2355RECIPE_MAINTAINER_pn-task-poky-standalone-gmae-sdk-target = "Dongxiao Xu <dongxiao.xu@intel.com>" 2355RECIPE_MAINTAINER_pn-task-core-standalone-gmae-sdk-target = "Dongxiao Xu <dongxiao.xu@intel.com>"
2356 2356
2357RECIPE_STATUS_pn-task-poky-standalone-sdk-target = "red" 2357RECIPE_STATUS_pn-task-core-standalone-sdk-target = "red"
2358RECIPE_LATEST_VERSION_pn-task-poky-standalone-sdk-target = "1.0" 2358RECIPE_LATEST_VERSION_pn-task-core-standalone-sdk-target = "1.0"
2359RECIPE_MAINTAINER_pn-task-poky-standalone-sdk-target = "Dongxiao Xu <dongxiao.xu@intel.com>" 2359RECIPE_MAINTAINER_pn-task-core-standalone-sdk-target = "Dongxiao Xu <dongxiao.xu@intel.com>"
2360 2360
2361RECIPE_STATUS_pn-xournal = "red" 2361RECIPE_STATUS_pn-xournal = "red"
2362RECIPE_LATEST_VERSION_pn-xournal = "0.4.5" 2362RECIPE_LATEST_VERSION_pn-xournal = "0.4.5"
@@ -2368,88 +2368,88 @@ RECIPE_LATEST_VERSION_pn-wv = "1.2.1"
2368RECIPE_LAST_UPDATE_pn-wv = "Jan 12, 2007" 2368RECIPE_LAST_UPDATE_pn-wv = "Jan 12, 2007"
2369RECIPE_MAINTAINER_pn-wv = "Dongxiao Xu <dongxiao.xu@intel.com>" 2369RECIPE_MAINTAINER_pn-wv = "Dongxiao Xu <dongxiao.xu@intel.com>"
2370 2370
2371RECIPE_STATUS_pn-poky-image-minimal = "green" 2371RECIPE_STATUS_pn-core-image-minimal = "green"
2372RECIPE_LATEST_VERSION_pn-poky-image-minimal = "1.0" 2372RECIPE_LATEST_VERSION_pn-core-image-minimal = "1.0"
2373RECIPE_MAINTAINER_pn-poky-image-minimal = "Dongxiao Xu <dongxiao.xu@intel.com>" 2373RECIPE_MAINTAINER_pn-core-image-minimal = "Dongxiao Xu <dongxiao.xu@intel.com>"
2374 2374
2375RECIPE_STATUS_pn-poky-image-minimal-directdisk = "green" 2375RECIPE_STATUS_pn-core-image-minimal-directdisk = "green"
2376RECIPE_LATEST_VERSION_pn-poky-image-minimal-directdisk = "1.0" 2376RECIPE_LATEST_VERSION_pn-core-image-minimal-directdisk = "1.0"
2377RECIPE_MAINTAINER_pn-poky-image-minimal-directdisk = "Dongxiao Xu <dongxiao.xu@intel.com>" 2377RECIPE_MAINTAINER_pn-core-image-minimal-directdisk = "Dongxiao Xu <dongxiao.xu@intel.com>"
2378 2378
2379RECIPE_STATUS_pn-poky-image-minimal-initramfs = "green" 2379RECIPE_STATUS_pn-core-image-minimal-initramfs = "green"
2380RECIPE_LATEST_VERSION_pn-poky-image-minimal-initramfs = "1.0" 2380RECIPE_LATEST_VERSION_pn-core-image-minimal-initramfs = "1.0"
2381RECIPE_MAINTAINER_pn-poky-image-minimal-initramfs = "Dongxiao Xu <dongxiao.xu@intel.com>" 2381RECIPE_MAINTAINER_pn-core-image-minimal-initramfs = "Dongxiao Xu <dongxiao.xu@intel.com>"
2382 2382
2383RECIPE_STATUS_pn-poky-image-minimal-live = "green" 2383RECIPE_STATUS_pn-core-image-minimal-live = "green"
2384RECIPE_LATEST_VERSION_pn-poky-image-minimal-live = "1.0" 2384RECIPE_LATEST_VERSION_pn-core-image-minimal-live = "1.0"
2385RECIPE_MAINTAINER_pn-poky-image-minimal-live = "Dongxiao Xu <dongxiao.xu@intel.com>" 2385RECIPE_MAINTAINER_pn-core-image-minimal-live = "Dongxiao Xu <dongxiao.xu@intel.com>"
2386 2386
2387RECIPE_STATUS_pn-poky-image-minimal-mtdutils = "green" 2387RECIPE_STATUS_pn-core-image-minimal-mtdutils = "green"
2388RECIPE_LATEST_VERSION_pn-poky-image-minimal-mtdutils = "1.0" 2388RECIPE_LATEST_VERSION_pn-core-image-minimal-mtdutils = "1.0"
2389RECIPE_MAINTAINER_pn-poky-image-minimal-mtdutils = "Dongxiao Xu <dongxiao.xu@intel.com>" 2389RECIPE_MAINTAINER_pn-core-image-minimal-mtdutils = "Dongxiao Xu <dongxiao.xu@intel.com>"
2390 2390
2391RECIPE_STATUS_pn-poky-image-basic = "green" 2391RECIPE_STATUS_pn-core-image-basic = "green"
2392RECIPE_LATEST_VERSION_pn-poky-image-basic = "1.0" 2392RECIPE_LATEST_VERSION_pn-core-image-basic = "1.0"
2393RECIPE_MAINTAINER_pn-poky-image-basic = "Dongxiao Xu <dongxiao.xu@intel.com>" 2393RECIPE_MAINTAINER_pn-core-image-basic = "Dongxiao Xu <dongxiao.xu@intel.com>"
2394 2394
2395RECIPE_STATUS_pn-poky-image-sato = "green" 2395RECIPE_STATUS_pn-core-image-sato = "green"
2396RECIPE_LATEST_VERSION_pn-poky-image-sato = "1.0" 2396RECIPE_LATEST_VERSION_pn-core-image-sato = "1.0"
2397RECIPE_MAINTAINER_pn-poky-image-sato = "Dongxiao Xu <dongxiao.xu@intel.com>" 2397RECIPE_MAINTAINER_pn-core-image-sato = "Dongxiao Xu <dongxiao.xu@intel.com>"
2398 2398
2399RECIPE_STATUS_pn-poky-image-sato-directdisk = "green" 2399RECIPE_STATUS_pn-core-image-sato-directdisk = "green"
2400RECIPE_LATEST_VERSION_pn-poky-image-sato-directdisk = "1.0" 2400RECIPE_LATEST_VERSION_pn-core-image-sato-directdisk = "1.0"
2401RECIPE_MAINTAINER_pn-poky-image-sato-directdisk = "Dongxiao Xu <dongxiao.xu@intel.com>" 2401RECIPE_MAINTAINER_pn-core-image-sato-directdisk = "Dongxiao Xu <dongxiao.xu@intel.com>"
2402 2402
2403RECIPE_STATUS_pn-poky-image-sato-live = "green" 2403RECIPE_STATUS_pn-core-image-sato-live = "green"
2404RECIPE_LATEST_VERSION_pn-poky-image-sato-live = "1.0" 2404RECIPE_LATEST_VERSION_pn-core-image-sato-live = "1.0"
2405RECIPE_MAINTAINER_pn-poky-image-sato-live = "Dongxiao Xu <dongxiao.xu@intel.com>" 2405RECIPE_MAINTAINER_pn-core-image-sato-live = "Dongxiao Xu <dongxiao.xu@intel.com>"
2406 2406
2407RECIPE_STATUS_pn-poky-image-lsb = "green" 2407RECIPE_STATUS_pn-core-image-lsb = "green"
2408RECIPE_LATEST_VERSION_pn-poky-image-lsb = "1.0" 2408RECIPE_LATEST_VERSION_pn-core-image-lsb = "1.0"
2409RECIPE_MAINTAINER_pn-poky-image-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>" 2409RECIPE_MAINTAINER_pn-core-image-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>"
2410 2410
2411RECIPE_STATUS_pn-poky-sato-image-sdk = "green" 2411RECIPE_STATUS_pn-poky-sato-image-sdk = "green"
2412RECIPE_LATEST_VERSION_pn-poky-image-sato-sdk = "1.0" 2412RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = "1.0"
2413RECIPE_MAINTAINER_pn-poky-image-sato-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>" 2413RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>"
2414DISTRO_PN_ALIAS_pn-poky-image-sdk = "Poky" 2414DISTRO_PN_ALIAS_pn-core-image-sdk = "Poky"
2415 2415
2416RECIPE_STATUS_pn-task-poky = "green" 2416RECIPE_STATUS_pn-task-poky = "green"
2417RECIPE_LATEST_VERSION_pn-task-poky = "1.0" 2417RECIPE_LATEST_VERSION_pn-task-poky = "1.0"
2418RECIPE_MAINTAINER_pn-task-poky = "Dongxiao Xu <dongxiao.xu@intel.com>" 2418RECIPE_MAINTAINER_pn-task-poky = "Dongxiao Xu <dongxiao.xu@intel.com>"
2419 2419
2420RECIPE_STATUS_pn-task-poky-basic = "green" 2420RECIPE_STATUS_pn-task-core-basic = "green"
2421RECIPE_LATEST_VERSION_pn-task-poky-basic = "1.0" 2421RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0"
2422RECIPE_MAINTAINER_pn-task-poky-basic = "Dongxiao Xu <dongxiao.xu@intel.com>" 2422RECIPE_MAINTAINER_pn-task-core-basic = "Dongxiao Xu <dongxiao.xu@intel.com>"
2423 2423
2424RECIPE_STATUS_pn-task-poky-lsb = "green" 2424RECIPE_STATUS_pn-task-core-lsb = "green"
2425RECIPE_LATEST_VERSION_pn-task-poky-lsb = "1.0" 2425RECIPE_LATEST_VERSION_pn-task-core-lsb = "1.0"
2426RECIPE_MAINTAINER_pn-task-poky-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>" 2426RECIPE_MAINTAINER_pn-task-core-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>"
2427 2427
2428RECIPE_STATUS_pn-task-sdk-host = "green" 2428RECIPE_STATUS_pn-task-sdk-host = "green"
2429RECIPE_LATEST_VERSION_pn-task-sdk-host = "1.0" 2429RECIPE_LATEST_VERSION_pn-task-sdk-host = "1.0"
2430RECIPE_MAINTAINER_pn-task-sdk-host = "Dongxiao Xu <dongxiao.xu@intel.com>" 2430RECIPE_MAINTAINER_pn-task-sdk-host = "Dongxiao Xu <dongxiao.xu@intel.com>"
2431 2431
2432RECIPE_STATUS_pn-task-poky-qt = "green" 2432RECIPE_STATUS_pn-task-core-qt = "green"
2433RECIPE_LATEST_VERSION_pn-task-poky-qt = "1.0" 2433RECIPE_LATEST_VERSION_pn-task-core-qt = "1.0"
2434RECIPE_MAINTAINER_pn-task-poky-qt = "Dongxiao Xu <dongxiao.xu@intel.com>" 2434RECIPE_MAINTAINER_pn-task-core-qt = "Dongxiao Xu <dongxiao.xu@intel.com>"
2435 2435
2436RECIPE_STATUS_pn-poky-image-base = "green" 2436RECIPE_STATUS_pn-core-image-base = "green"
2437RECIPE_LATEST_VERSION_pn-poky-image-base = "1.0" 2437RECIPE_LATEST_VERSION_pn-core-image-base = "1.0"
2438RECIPE_MAINTAINER_pn-poky-image-base = "Dongxiao Xu <dongxiao.xu@intel.com>" 2438RECIPE_MAINTAINER_pn-core-image-base = "Dongxiao Xu <dongxiao.xu@intel.com>"
2439 2439
2440RECIPE_STATUS_pn-poky-image-core = "green" 2440RECIPE_STATUS_pn-core-image-core = "green"
2441RECIPE_LATEST_VERSION_pn-poky-image-core = "1.0" 2441RECIPE_LATEST_VERSION_pn-core-image-core = "1.0"
2442RECIPE_MAINTAINER_pn-poky-image-core = "Dongxiao Xu <dongxiao.xu@intel.com>" 2442RECIPE_MAINTAINER_pn-core-image-core = "Dongxiao Xu <dongxiao.xu@intel.com>"
2443 2443
2444RECIPE_STATUS_pn-poky-image-sato-sdk-live = "green" 2444RECIPE_STATUS_pn-core-image-sato-sdk-live = "green"
2445RECIPE_LATEST_VERSION_pn-poky-image-sato-sdk-live = "1.0" 2445RECIPE_LATEST_VERSION_pn-core-image-sato-sdk-live = "1.0"
2446RECIPE_MAINTAINER_pn-poky-image-sato-sdk-live = "Dongxiao Xu <dongxiao.xu@intel.com>" 2446RECIPE_MAINTAINER_pn-core-image-sato-sdk-live = "Dongxiao Xu <dongxiao.xu@intel.com>"
2447DISTRO_PN_ALIAS_pn-poky-image-sato-sdk-live = "Poky" 2447DISTRO_PN_ALIAS_pn-core-image-sato-sdk-live = "Poky"
2448 2448
2449RECIPE_STATUS_pn-poky-image-sato-sdk-directdisk = "green" 2449RECIPE_STATUS_pn-core-image-sato-sdk-directdisk = "green"
2450RECIPE_LATEST_VERSION_pn-poky-image-sato-sdk-directdisk = "1.0" 2450RECIPE_LATEST_VERSION_pn-core-image-sato-sdk-directdisk = "1.0"
2451RECIPE_MAINTAINER_pn-poky-image-sato-sdk-directdisk = "Dongxiao Xu <dongxiao.xu@intel.com>" 2451RECIPE_MAINTAINER_pn-core-image-sato-sdk-directdisk = "Dongxiao Xu <dongxiao.xu@intel.com>"
2452DISTRO_PN_ALIAS_pn-poky-image-sato-sdk-directdisk = "Poky" 2452DISTRO_PN_ALIAS_pn-core-image-sato-sdk-directdisk = "Poky"
2453 2453
2454RECIPE_STATUS_pn-liba52="yellow" # patch investigation needed 2454RECIPE_STATUS_pn-liba52="yellow" # patch investigation needed
2455DISTRO_PN_ALIAS_pn-liba52 = "Mandriva=a52dec Debian=a52dec" 2455DISTRO_PN_ALIAS_pn-liba52 = "Mandriva=a52dec Debian=a52dec"
@@ -5361,31 +5361,31 @@ RECIPE_LAST_UPDATE_pn-mutter = "Jan 13, 2010"
5361RECIPE_MAINTAINER_pn-mutter = "Edwin Zhai <edwin.zhai@intel.com>" 5361RECIPE_MAINTAINER_pn-mutter = "Edwin Zhai <edwin.zhai@intel.com>"
5362 5362
5363DISTRO_PN_ALIAS_pn-poky-feed-config-opkg = "Poky" 5363DISTRO_PN_ALIAS_pn-poky-feed-config-opkg = "Poky"
5364DISTRO_PN_ALIAS_pn-poky-image-base = "Poky" 5364DISTRO_PN_ALIAS_pn-core-image-base = "Poky"
5365DISTRO_PN_ALIAS_pn-poky-image-basic = "Poky" 5365DISTRO_PN_ALIAS_pn-core-image-basic = "Poky"
5366DISTRO_PN_ALIAS_pn-poky-image-core = "Poky" 5366DISTRO_PN_ALIAS_pn-core-image-core = "Poky"
5367DISTRO_PN_ALIAS_pn-poky-image-lsb = "Poky" 5367DISTRO_PN_ALIAS_pn-core-image-lsb = "Poky"
5368DISTRO_PN_ALIAS_pn-poky-image-minimal = "Poky" 5368DISTRO_PN_ALIAS_pn-core-image-minimal = "Poky"
5369DISTRO_PN_ALIAS_pn-poky-image-minimal-directdisk = "Poky" 5369DISTRO_PN_ALIAS_pn-core-image-minimal-directdisk = "Poky"
5370DISTRO_PN_ALIAS_pn-poky-image-minimal-initramfs = "Poky" 5370DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "Poky"
5371DISTRO_PN_ALIAS_pn-poky-image-minimal-live = "Poky" 5371DISTRO_PN_ALIAS_pn-core-image-minimal-live = "Poky"
5372DISTRO_PN_ALIAS_pn-poky-image-minimal-mtdutils = "Poky" 5372DISTRO_PN_ALIAS_pn-core-image-minimal-mtdutils = "Poky"
5373DISTRO_PN_ALIAS_pn-poky-image-sato = "Poky" 5373DISTRO_PN_ALIAS_pn-core-image-sato = "Poky"
5374DISTRO_PN_ALIAS_pn-poky-image-sato-directdisk = "Poky" 5374DISTRO_PN_ALIAS_pn-core-image-sato-directdisk = "Poky"
5375DISTRO_PN_ALIAS_pn-poky-image-sato-live = "Poky" 5375DISTRO_PN_ALIAS_pn-core-image-sato-live = "Poky"
5376DISTRO_PN_ALIAS_pn-task-poky = "Poky" 5376DISTRO_PN_ALIAS_pn-task-poky = "Poky"
5377DISTRO_PN_ALIAS_pn-task-poky-apps-x11-pimlico = "Poky" 5377DISTRO_PN_ALIAS_pn-task-core-apps-x11-pimlico = "Poky"
5378DISTRO_PN_ALIAS_pn-task-poky-basic = "Poky" 5378DISTRO_PN_ALIAS_pn-task-core-basic = "Poky"
5379DISTRO_PN_ALIAS_pn-task-poky-boot = "Poky" 5379DISTRO_PN_ALIAS_pn-task-core-boot = "Poky"
5380DISTRO_PN_ALIAS_pn-task-poky-lsb = "Poky" 5380DISTRO_PN_ALIAS_pn-task-core-lsb = "Poky"
5381DISTRO_PN_ALIAS_pn-task-poky-nfs = "Poky" 5381DISTRO_PN_ALIAS_pn-task-core-nfs = "Poky"
5382DISTRO_PN_ALIAS_pn-task-poky-qt = "Poky" 5382DISTRO_PN_ALIAS_pn-task-core-qt = "Poky"
5383DISTRO_PN_ALIAS_pn-task-poky-sdk = "Poky" 5383DISTRO_PN_ALIAS_pn-task-core-sdk = "Poky"
5384DISTRO_PN_ALIAS_pn-task-poky-sdk-gmae = "Poky" 5384DISTRO_PN_ALIAS_pn-task-core-sdk-gmae = "Poky"
5385DISTRO_PN_ALIAS_pn-task-poky-standalone-gmae-sdk-target = "Poky" 5385DISTRO_PN_ALIAS_pn-task-core-standalone-gmae-sdk-target = "Poky"
5386DISTRO_PN_ALIAS_pn-task-poky-standalone-sdk-target = "Poky" 5386DISTRO_PN_ALIAS_pn-task-core-standalone-sdk-target = "Poky"
5387DISTRO_PN_ALIAS_pn-task-poky-tools = "Poky" 5387DISTRO_PN_ALIAS_pn-task-core-tools = "Poky"
5388DISTRO_PN_ALIAS_pn-task-poky-x11-sato = "Poky" 5388DISTRO_PN_ALIAS_pn-task-core-x11-sato = "Poky"
5389DISTRO_PN_ALIAS_pn-initramfs-boot = "Poky" 5389DISTRO_PN_ALIAS_pn-initramfs-boot = "Poky"
5390DISTRO_PN_ALIAS_pn-initramfs-live-boot = "Poky" 5390DISTRO_PN_ALIAS_pn-initramfs-live-boot = "Poky"
5391DISTRO_PN_ALIAS_pn-initramfs-live-install = "Poky" 5391DISTRO_PN_ALIAS_pn-initramfs-live-install = "Poky"
@@ -5452,8 +5452,8 @@ RECIPE_STATUS_pn-moblin-proto = "red"
5452DISTRO_PN_ALIAS_pn-moblin-proto = "Poky" 5452DISTRO_PN_ALIAS_pn-moblin-proto = "Poky"
5453RECIPE_STATUS_pn-package-index = "red" 5453RECIPE_STATUS_pn-package-index = "red"
5454DISTRO_PN_ALIAS_pn-package-index = "Poky" 5454DISTRO_PN_ALIAS_pn-package-index = "Poky"
5455RECIPE_STATUS_pn-poky-image-clutter = "red" 5455RECIPE_STATUS_pn-core-image-clutter = "red"
5456DISTRO_PN_ALIAS_pn-poky-image-clutter = "Poky" 5456DISTRO_PN_ALIAS_pn-core-image-clutter = "Poky"
5457RECIPE_STATUS_pn-prism-firmware = "red" 5457RECIPE_STATUS_pn-prism-firmware = "red"
5458RECIPE_STATUS_pn-run-postinsts = "red" 5458RECIPE_STATUS_pn-run-postinsts = "red"
5459DISTRO_PN_ALIAS_pn-run-postinsts = "Poky" 5459DISTRO_PN_ALIAS_pn-run-postinsts = "Poky"
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 0247cf8..e74f2da 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
3LICENSE = "GPL" 3LICENSE = "GPL"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
5 5
6RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash" 6RDEPENDS_${PN} = "distcc task-core-nfs-server oprofileui-server rsync bash"
7PR = "r19" 7PR = "r19"
8 8
9SRC_URI = "file://distcc.sh \ 9SRC_URI = "file://distcc.sh \
diff --git a/meta/recipes-core/images/poky-image-base.bb b/meta/recipes-core/images/core-image-base.bb
index 461b805..461b805 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 c232ccd..c232ccd 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 64144b9..64144b9 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 a1b0e1a..2c9b3fb 100644
--- a/meta/recipes-core/images/poky-image-live.inc
+++ b/meta/recipes-core/images/core-image-live.inc
@@ -1,5 +1,5 @@
1AUTO_SYSLINUXCFG = "1" 1AUTO_SYSLINUXCFG = "1"
2INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" 2INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
3APPEND += "root=/dev/ram0 " 3APPEND += "root=/dev/ram0 "
4TIMEOUT = "10" 4TIMEOUT = "10"
5 5
@@ -8,7 +8,7 @@ EXCLUDE_FROM_WORLD = "1"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 8LIC_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
11do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs" 11do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
12 12
13inherit bootimg 13inherit 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 c64b657..248d29f 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#
4IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}" 4IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}"
5 5
6IMAGE_FEATURES += "dev-pkgs" 6IMAGE_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 0000000..ed23e45
--- /dev/null
+++ b/meta/recipes-core/images/core-image-minimal-directdisk.bb
@@ -0,0 +1,11 @@
1require core-image-directdisk.inc
2
3DESCRIPTION = "Minimal Bootable Direct Disk Image"
4
5ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3"
6
7LICENSE = "MIT"
8
9do_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 a94e712..3da4a95 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
3IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" 3IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd"
4 4
5export IMAGE_BASENAME = "poky-image-minimal-initramfs" 5export IMAGE_BASENAME = "core-image-minimal-initramfs"
6IMAGE_LINGUAS = "" 6IMAGE_LINGUAS = ""
7 7
8LICENSE = "MIT" 8LICENSE = "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 0000000..0ce2afb
--- /dev/null
+++ b/meta/recipes-core/images/core-image-minimal-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "Minimal Bootable Live Image"
2
3require core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_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 d786131..adabaa4 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#
4require poky-image-minimal.bb 4require core-image-minimal.bb
5 5
6IMAGE_INSTALL += "mtd-utils" 6IMAGE_INSTALL += "mtd-utils"
diff --git a/meta/recipes-core/images/poky-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 6a641f3..3aae04e 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#
4IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" 4IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}"
5 5
6IMAGE_LINGUAS = " " 6IMAGE_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 18d993e..0000000
--- a/meta/recipes-core/images/poky-image-minimal-directdisk.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require poky-image-directdisk.inc
2
3DESCRIPTION = "Minimal Bootable Direct Disk Image"
4
5ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
6
7LICENSE = "MIT"
8
9do_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 f3d3638..0000000
--- a/meta/recipes-core/images/poky-image-minimal-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Minimal Bootable Live Image"
2
3require poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_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 595aba3..4f5501e 100644
--- a/meta/recipes-core/meta/meta-toolchain-gmae.bb
+++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb
@@ -1,4 +1,4 @@
1TOOLCHAIN_TARGET_GMAETASK ?= "task-poky-standalone-gmae-sdk-target task-poky-standalone-gmae-sdk-target-dbg" 1TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg"
2TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" 2TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}"
3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" 3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}"
4PROVIDES = "meta-toolchain-sdk" 4PROVIDES = "meta-toolchain-sdk"
diff --git a/meta/recipes-core/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 7166761..5aea771 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"
17MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" 17MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
18MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" 18MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
19 19
20RDEPENDS_task-poky-boot = "\ 20RDEPENDS_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
34RRECOMMENDS_task-poky-boot = "\ 34RRECOMMENDS_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 a18d2e3..d5d8291 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
9PR = "r0" 9PR = "r0"
10 10
11PACKAGES = "\ 11PACKAGES = "\
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
17ALLOW_EMPTY = "1" 17ALLOW_EMPTY = "1"
18 18
19RDEPENDS_task-poky-nfs-server = "\ 19RDEPENDS_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
23GLIBC_DEPENDENCIES = "glibc-utils" 23GLIBC_DEPENDENCIES = "glibc-utils"
24 24
25RRECOMMENDS_task-poky-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" 25RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}"
26RRECOMMENDS_task-poky-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}" 26RRECOMMENDS_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 b1e52c9..a158509 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
15PACKAGES = "\ 15PACKAGES = "\
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
20RDEPENDS_task-poky-sdk = "\ 20RDEPENDS_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 4f2ab44..1e7402e 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
5PR = "r0" 5PR = "r0"
6 6
7PACKAGES = "\ 7PACKAGES = "\
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
13ALLOW_EMPTY = "1" 13ALLOW_EMPTY = "1"
14 14
15RDEPENDS_task-poky-ssh-dropbear = "dropbear" 15RDEPENDS_task-core-ssh-dropbear = "dropbear"
16RDEPENDS_task-poky-ssh-dropbear-dbg = "dropbear-dbg" 16RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg"
17RDEPENDS_task-poky-ssh-dropbear-dev = "dropbear-dev" 17RDEPENDS_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 5f828b5..794399a 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
5PR = "r0" 5PR = "r0"
6 6
7PACKAGES = "\ 7PACKAGES = "\
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
13ALLOW_EMPTY = "1" 13ALLOW_EMPTY = "1"
14 14
15RDEPENDS_task-poky-ssh-openssh = "openssh" 15RDEPENDS_task-core-ssh-openssh = "openssh"
16RDEPENDS_task-poky-ssh-openssh-dbg = "openssh-dbg" 16RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg"
17RDEPENDS_task-poky-ssh-openssh-dev = "openssh-dev" 17RDEPENDS_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 3835ac7..3835ac7 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 29f5d4a..958dff1 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
9PR = "r8" 9PR = "r8"
10 10
11PACKAGES = "\ 11PACKAGES = "\
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
23PACKAGE_ARCH = "${MACHINE_ARCH}" 23PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -30,14 +30,14 @@ KEXECTOOLS_mips ?= ""
30KEXECTOOLS_mipsel ?= "" 30KEXECTOOLS_mipsel ?= ""
31KEXECTOOLS_powerpc ?= "" 31KEXECTOOLS_powerpc ?= ""
32 32
33RDEPENDS_task-poky-tools-debug = "\ 33RDEPENDS_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
40RDEPENDS_task-poky-tools-profile = "\ 40RDEPENDS_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
48RRECOMMENDS_task-poky-tools-profile = "\ 48RRECOMMENDS_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.
63RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" 63RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap"
64RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust systemtap" 64RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap"
65RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust systemtap" 65RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap"
66RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust systemtap" 66RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap"
67RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust systemtap" 67RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap"
68 68
69RDEPENDS_task-poky-tools-testapps = "\ 69RDEPENDS_task-core-tools-testapps = "\
70 blktool \ 70 blktool \
71 fstests \ 71 fstests \
72 tslib-calibrate \ 72 tslib-calibrate \
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index d7a40c2..ea36674 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -252,8 +252,8 @@ get_qemu_image()
252 check_result 252 check_result
253 253
254 for image_type in $select_rootfs; do 254 for image_type in $select_rootfs; do
255 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" 255 #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-qemu$1.tar.bz2"
256 filename="poky-image-$image_type-qemu$target.tar.bz2" 256 filename="core-image-$image_type-qemu$target.tar.bz2"
257 download_file qemu$1/$filename 257 download_file qemu$1/$filename
258 check_result 258 check_result
259 done 259 done
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 65b1b54..0fd9e47 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -172,7 +172,7 @@ echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_
172 172
173 173
174qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'` 174qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'`
175sysroot_image_name="poky-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" 175sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2"
176 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." 176 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
177 177
178scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type 178scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type
diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 76d5dc2..86972c3 100644
--- a/meta/recipes-extended/images/poky-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,8 +1,8 @@
1IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 1IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 task-poky-boot \ 4 task-core-boot \
5 task-poky-basic \ 5 task-core-basic \
6 " 6 "
7 7
8# ${POKY_BASE_INSTALL} 8# ${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 578fbd0..86baf23 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"
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \ 4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \ 5 task-core-basic \
6 task-poky-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit 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 0000000..72f10f7
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "LSB Bootable Live Image"
2
3require recipes-core/images/core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_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 0000000..b01ae06
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "LSB SDK Bootable Live Image"
2
3require recipes-core/images/core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-sdk-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_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 967bb02..74ad1d2 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
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \ 4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \ 5 task-core-basic \
6 task-poky-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 33532ea..63180f5 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"
2 2
3IMAGE_INSTALL = "\ 3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \ 4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \ 5 task-core-basic \
6 task-poky-lsb \ 6 task-core-lsb \
7 " 7 "
8 8
9inherit poky-image 9inherit 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 baa9ea0..0000000
--- a/meta/recipes-extended/images/poky-image-lsb-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "LSB Bootable Live Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_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 370780a..0000000
--- a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "LSB SDK Bootable Live Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-sdk-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_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 9128237..e5963df 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
3We need to configure a package that the system can use to determine the 3We need to configure a package that the system can use to determine the
4system distribution version. 4system distribution version.
5 5
6Hack: for now set to task-poky-rpm. 6Hack: for now set to task-core-rpm.
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
@@ -15,7 +15,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
15 15
16 std::string ZConfig::distroverpkg() const 16 std::string ZConfig::distroverpkg() const
17- { return "redhat-release"; } 17- { return "redhat-release"; }
18+ { return "task-poky-rpm"; } 18+ { return "task-core-rpm"; }
19 19
20 /////////////////////////////////////////////////////////////////// 20 ///////////////////////////////////////////////////////////////////
21 21
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb
index 68c996d..e2a37d1 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
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-basic \ 12 task-core-basic \
13 task-poky-base-utils \ 13 task-core-base-utils \
14 task-poky-base-utils-dbg \ 14 task-core-base-utils-dbg \
15 task-poky-base-utils-dev \ 15 task-core-base-utils-dev \
16 task-poky-basic-libs \ 16 task-core-basic-libs \
17 task-poky-basic-libs-dbg \ 17 task-core-basic-libs-dbg \
18 task-poky-basic-libs-dev \ 18 task-core-basic-libs-dev \
19 task-poky-basic-utils \ 19 task-core-basic-utils \
20 task-poky-basic-utils-dbg \ 20 task-core-basic-utils-dbg \
21 task-poky-basic-utils-dev \ 21 task-core-basic-utils-dev \
22 task-poky-basic-extended \ 22 task-core-basic-extended \
23 task-poky-basic-extended-dbg \ 23 task-core-basic-extended-dbg \
24 task-poky-basic-extended-dev \ 24 task-core-basic-extended-dev \
25 task-poky-dev-utils \ 25 task-core-dev-utils \
26 task-poky-dev-utils-dbg \ 26 task-core-dev-utils-dbg \
27 task-poky-dev-utils-dev \ 27 task-core-dev-utils-dev \
28 task-poky-multiuser \ 28 task-core-multiuser \
29 task-poky-multiuser-dbg \ 29 task-core-multiuser-dbg \
30 task-poky-multiuser-dev \ 30 task-core-multiuser-dev \
31 task-poky-initscripts \ 31 task-core-initscripts \
32 task-poky-initscripts-dbg \ 32 task-core-initscripts-dbg \
33 task-poky-initscripts-dev \ 33 task-core-initscripts-dev \
34 task-poky-rpm \ 34 task-core-rpm \
35 task-poky-rpm-dbg \ 35 task-core-rpm-dbg \
36 task-poky-rpm-dev \ 36 task-core-rpm-dev \
37 task-poky-sys-services \ 37 task-core-sys-services \
38 task-poky-sys-services-dbg \ 38 task-core-sys-services-dbg \
39 task-poky-sys-services-dev \ 39 task-core-sys-services-dev \
40 " 40 "
41 41
42ALLOW_EMPTY = "1" 42ALLOW_EMPTY = "1"
43 43
44RDEPENDS_task-poky-basic = "\ 44RDEPENDS_task-core-basic = "\
45 task-poky-base-utils \ 45 task-core-base-utils \
46 task-poky-basic-libs \ 46 task-core-basic-libs \
47 task-poky-basic-utils \ 47 task-core-basic-utils \
48 task-poky-basic-extended \ 48 task-core-basic-extended \
49 task-poky-dev-utils \ 49 task-core-dev-utils \
50 task-poky-multiuser \ 50 task-core-multiuser \
51 task-poky-initscripts \ 51 task-core-initscripts \
52 task-poky-rpm \ 52 task-core-rpm \
53 task-poky-sys-services \ 53 task-core-sys-services \
54 " 54 "
55 55
56RDEPENDS_task-poky-base-utils = "\ 56RDEPENDS_task-core-base-utils = "\
57 busybox \ 57 busybox \
58 " 58 "
59 59
60RDEPENDS_task-poky-basic-libs = "\ 60RDEPENDS_task-core-basic-libs = "\
61 glib-2.0 \ 61 glib-2.0 \
62 " 62 "
63 63
64RDEPENDS_task-poky-basic-utils = "\ 64RDEPENDS_task-core-basic-utils = "\
65 bash \ 65 bash \
66 acl \ 66 acl \
67 attr \ 67 attr \
@@ -92,7 +92,7 @@ RDEPENDS_task-poky-basic-utils = "\
92 zlib \ 92 zlib \
93 " 93 "
94 94
95RDEPENDS_task-poky-basic-extended = "\ 95RDEPENDS_task-core-basic-extended = "\
96 iproute2 \ 96 iproute2 \
97 iputils \ 97 iputils \
98 iptables \ 98 iptables \
@@ -100,7 +100,7 @@ RDEPENDS_task-poky-basic-extended = "\
100 openssl \ 100 openssl \
101 " 101 "
102 102
103RDEPENDS_task-poky-dev-utils = "\ 103RDEPENDS_task-core-dev-utils = "\
104 byacc \ 104 byacc \
105 diffutils \ 105 diffutils \
106 m4 \ 106 m4 \
@@ -108,7 +108,7 @@ RDEPENDS_task-poky-dev-utils = "\
108 patch \ 108 patch \
109 " 109 "
110 110
111RDEPENDS_task-poky-initscripts = "\ 111RDEPENDS_task-core-initscripts = "\
112 initscripts \ 112 initscripts \
113 sysvinit \ 113 sysvinit \
114 ethtool \ 114 ethtool \
@@ -116,7 +116,7 @@ RDEPENDS_task-poky-initscripts = "\
116 sysklogd \ 116 sysklogd \
117 " 117 "
118 118
119RDEPENDS_task-poky-multiuser = "\ 119RDEPENDS_task-core-multiuser = "\
120 cracklib \ 120 cracklib \
121 gzip \ 121 gzip \
122 libuser \ 122 libuser \
@@ -125,13 +125,13 @@ RDEPENDS_task-poky-multiuser = "\
125 sudo \ 125 sudo \
126 " 126 "
127 127
128RDEPENDS_task-poky-rpm = "\ 128RDEPENDS_task-core-rpm = "\
129 beecrypt \ 129 beecrypt \
130 rpm \ 130 rpm \
131 zypper \ 131 zypper \
132 " 132 "
133 133
134RDEPENDS_task-poky-sys-services = "\ 134RDEPENDS_task-core-sys-services = "\
135 at \ 135 at \
136 bzip2 \ 136 bzip2 \
137 cronie \ 137 cronie \
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index b56c07b..ef8acb1 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
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-lsb \ 12 task-core-lsb \
13 task-poky-sys-extended \ 13 task-core-sys-extended \
14 task-poky-sys-extended-dbg \ 14 task-core-sys-extended-dbg \
15 task-poky-sys-extended-dev \ 15 task-core-sys-extended-dev \
16 task-poky-db \ 16 task-core-db \
17 task-poky-db-dbg \ 17 task-core-db-dbg \
18 task-poky-db-dev \ 18 task-core-db-dev \
19 task-poky-misc \ 19 task-core-misc \
20 task-poky-misc-dbg \ 20 task-core-misc-dbg \
21 task-poky-misc-dev \ 21 task-core-misc-dev \
22 task-poky-perl \ 22 task-core-perl \
23 task-poky-perl-dbg \ 23 task-core-perl-dbg \
24 task-poky-perl-dev \ 24 task-core-perl-dev \
25 task-poky-python \ 25 task-core-python \
26 task-poky-python-dbg \ 26 task-core-python-dbg \
27 task-poky-python-dev \ 27 task-core-python-dev \
28 task-poky-tcl \ 28 task-core-tcl \
29 task-poky-tcl-dbg \ 29 task-core-tcl-dbg \
30 task-poky-tcl-dev \ 30 task-core-tcl-dev \
31 task-poky-lsb-perl-add \ 31 task-core-lsb-perl-add \
32 task-poky-lsb-python-add \ 32 task-core-lsb-python-add \
33 task-poky-lsb-graphic-add \ 33 task-core-lsb-graphic-add \
34 task-poky-lsb-runtime-add \ 34 task-core-lsb-runtime-add \
35 task-poky-lsb-command-add \ 35 task-core-lsb-command-add \
36 " 36 "
37 37
38 38
39ALLOW_EMPTY = "1" 39ALLOW_EMPTY = "1"
40 40
41RDEPENDS_task-poky-lsb = "\ 41RDEPENDS_task-core-lsb = "\
42 task-poky-sys-extended \ 42 task-core-sys-extended \
43 task-poky-db \ 43 task-core-db \
44 task-poky-misc \ 44 task-core-misc \
45 task-poky-perl \ 45 task-core-perl \
46 task-poky-python \ 46 task-core-python \
47 task-poky-tcl \ 47 task-core-tcl \
48 task-poky-lsb-perl-add \ 48 task-core-lsb-perl-add \
49 task-poky-lsb-python-add \ 49 task-core-lsb-python-add \
50 task-poky-lsb-graphic-add \ 50 task-core-lsb-graphic-add \
51 task-poky-lsb-runtime-add \ 51 task-core-lsb-runtime-add \
52 task-poky-lsb-command-add \ 52 task-core-lsb-command-add \
53 " 53 "
54 54
55RDEPENDS_task-poky-sys-extended = "\ 55RDEPENDS_task-core-sys-extended = "\
56 binutils \ 56 binutils \
57 chkconfig \ 57 chkconfig \
58 curl \ 58 curl \
@@ -81,19 +81,19 @@ RDEPENDS_task-poky-sys-extended = "\
81 zip \ 81 zip \
82 " 82 "
83 83
84RDEPENDS_task-poky-db = "\ 84RDEPENDS_task-core-db = "\
85 db \ 85 db \
86 sqlite3 \ 86 sqlite3 \
87 " 87 "
88 88
89RDEPENDS_task-poky-perl = "\ 89RDEPENDS_task-core-perl = "\
90 gdbm \ 90 gdbm \
91 perl \ 91 perl \
92 zlib \ 92 zlib \
93 " 93 "
94 94
95 95
96RDEPENDS_task-poky-python = "\ 96RDEPENDS_task-core-python = "\
97 expat \ 97 expat \
98 gdbm \ 98 gdbm \
99 gmp \ 99 gmp \
@@ -104,11 +104,11 @@ RDEPENDS_task-poky-python = "\
104 zip \ 104 zip \
105 " 105 "
106 106
107RDEPENDS_task-poky-tcl = "\ 107RDEPENDS_task-core-tcl = "\
108 tcl \ 108 tcl \
109 " 109 "
110 110
111RDEPENDS_task-poky-misc = "\ 111RDEPENDS_task-core-misc = "\
112 elfutils \ 112 elfutils \
113 gettext \ 113 gettext \
114 groff \ 114 groff \
@@ -124,7 +124,7 @@ RDEPENDS_task-poky-misc = "\
124 zlib \ 124 zlib \
125 " 125 "
126 126
127RDEPENDS_task-poky-lsb-command-add = "\ 127RDEPENDS_task-core-lsb-command-add = "\
128 localedef \ 128 localedef \
129 fontconfig-utils \ 129 fontconfig-utils \
130 mailx \ 130 mailx \
@@ -133,19 +133,19 @@ RDEPENDS_task-poky-lsb-command-add = "\
133" 133"
134# cups 134# cups
135 135
136RDEPENDS_task-poky-lsb-perl-add = "\ 136RDEPENDS_task-core-lsb-perl-add = "\
137 perl-modules \ 137 perl-modules \
138 perl-dev \ 138 perl-dev \
139 perl-misc \ 139 perl-misc \
140 perl-pod \ 140 perl-pod \
141" 141"
142 142
143RDEPENDS_task-poky-lsb-python-add = "\ 143RDEPENDS_task-core-lsb-python-add = "\
144 python-modules \ 144 python-modules \
145 python-misc \ 145 python-misc \
146" 146"
147 147
148RDEPENDS_task-poky-lsb-graphic-add = "\ 148RDEPENDS_task-core-lsb-graphic-add = "\
149 libqtcore4 \ 149 libqtcore4 \
150 libqtgui4 \ 150 libqtgui4 \
151 libqtsql4 \ 151 libqtsql4 \
@@ -166,19 +166,19 @@ RDEPENDS_task-poky-lsb-graphic-add = "\
166 gdk-pixbuf-loader-ani \ 166 gdk-pixbuf-loader-ani \
167" 167"
168 168
169RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\ 169RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\
170 libqtopengl4 \ 170 libqtopengl4 \
171" 171"
172RDEPENDS_task-poky-lsb-graphic-add_atom-pc = "\ 172RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\
173 libqtopengl4 \ 173 libqtopengl4 \
174" 174"
175RDEPENDS_task-poky-lsb-graphic-add_qemuppc = "\ 175RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\
176 libqtopengl4 \ 176 libqtopengl4 \
177" 177"
178 178
179# mesa-dri 179# mesa-dri
180 180
181RDEPENDS_task-poky-lsb-runtime-add = "\ 181RDEPENDS_task-core-lsb-runtime-add = "\
182 ldd \ 182 ldd \
183 pam-plugin-wheel \ 183 pam-plugin-wheel \
184 e2fsprogs-mke2fs \ 184 e2fsprogs-mke2fs \
diff --git a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
index b5c2fda..6cb1410 100644
--- a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb
+++ b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
@@ -15,7 +15,7 @@ require task-sdk-gmae.inc
15PACKAGES = "${PN}" 15PACKAGES = "${PN}"
16 16
17RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
18 task-poky-sdk \ 18 task-core-sdk \
19 libglade-dev \ 19 libglade-dev \
20 ${SDK-GMAE} \ 20 ${SDK-GMAE} \
21 ${SDK-EXTRAS}" 21 ${SDK-EXTRAS}"
diff --git a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
index ad6270a..32e60a8 100644
--- a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
@@ -15,7 +15,7 @@ require task-sdk-gmae.inc
15PACKAGES = "${PN} ${PN}-dbg" 15PACKAGES = "${PN} ${PN}-dbg"
16 16
17RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
18 task-poky-standalone-sdk-target \ 18 task-core-standalone-sdk-target \
19 libglade-dev \ 19 libglade-dev \
20 ${SDK-GMAE} \ 20 ${SDK-GMAE} \
21 ${SDK-EXTRAS}" 21 ${SDK-EXTRAS}"
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
index 210b949..e9dc8a2 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
@@ -1,4 +1,4 @@
1Install example binary needed for poky-image-clutter 1Install example binary needed for core-image-clutter
2 2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4Index: git/examples/Makefile.am 4Index: git/examples/Makefile.am
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
index e91b827..c18ffec 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
@@ -1,4 +1,4 @@
1Install the test binary needed for poky-image-clutter 1Install the test binary needed for core-image-clutter
2 2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4 4
diff --git a/meta/recipes-graphics/images/poky-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index a1dcb51..66839f4 100644
--- a/meta/recipes-graphics/images/poky-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -4,8 +4,8 @@ LICENSE = "MIT"
4 4
5IMAGE_INSTALL = "\ 5IMAGE_INSTALL = "\
6 ${POKY_BASE_INSTALL} \ 6 ${POKY_BASE_INSTALL} \
7 task-poky-clutter-core \ 7 task-core-clutter-core \
8 task-poky-clutter-tests \ 8 task-core-clutter-tests \
9 task-poky-clutter-apps" 9 task-core-clutter-apps"
10 10
11inherit poky-image 11inherit poky-image
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb
index 555a9ee..43c6525 100644
--- a/meta/recipes-graphics/tasks/task-poky-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-core-clutter.bb
@@ -10,27 +10,27 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
10PR = "r4" 10PR = "r4"
11 11
12PACKAGES = "\ 12PACKAGES = "\
13 task-poky-clutter-core \ 13 task-core-clutter-core \
14 task-poky-clutter-core-dbg \ 14 task-core-clutter-core-dbg \
15 task-poky-clutter-core-dev \ 15 task-core-clutter-core-dev \
16 task-poky-clutter-apps \ 16 task-core-clutter-apps \
17 task-poky-clutter-apps-dbg \ 17 task-core-clutter-apps-dbg \
18 task-poky-clutter-apps-dev \ 18 task-core-clutter-apps-dev \
19 task-poky-clutter-tests \ 19 task-core-clutter-tests \
20 task-poky-clutter-tests-dbg \ 20 task-core-clutter-tests-dbg \
21 task-poky-clutter-tests-dev \ 21 task-core-clutter-tests-dev \
22 " 22 "
23 23
24ALLOW_EMPTY = "1" 24ALLOW_EMPTY = "1"
25 25
26RDEPENDS_task-poky-clutter-core = "\ 26RDEPENDS_task-core-clutter-core = "\
27 clutter-1.4 \ 27 clutter-1.4 \
28 clutter-gst-1.4 \ 28 clutter-gst-1.4 \
29 clutter-gtk-1.4" 29 clutter-gtk-1.4"
30 30
31RDEPENDS_task-poky-clutter-tests = "\ 31RDEPENDS_task-core-clutter-tests = "\
32 clutter-gst-1.4-examples \ 32 clutter-gst-1.4-examples \
33 clutter-gtk-1.4-examples" 33 clutter-gtk-1.4-examples"
34 34
35#RDEPENDS_task-poky-clutter-apps = "\ 35#RDEPENDS_task-core-clutter-apps = "\
36# clutter-box2d " 36# clutter-box2d "
diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-core-qt.bb
index 762dff8..69512a4 100644
--- a/meta/recipes-qt/tasks/task-poky-qt.bb
+++ b/meta/recipes-qt/tasks/task-core-qt.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r3" 9PR = "r3"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-qt-demos \ 12 task-core-qt-demos \
13 task-poky-qt-demos-dbg \ 13 task-core-qt-demos-dbg \
14 task-poky-qt-demos-dev \ 14 task-core-qt-demos-dev \
15 " 15 "
16 16
17ALLOW_EMPTY = "1" 17ALLOW_EMPTY = "1"
@@ -19,4 +19,4 @@ ALLOW_EMPTY = "1"
19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" 19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
20#QTDEMOS_disabled = "fotowall" 20#QTDEMOS_disabled = "fotowall"
21 21
22RDEPENDS_task-poky-qt-demos = "${QTDEMOS}" 22RDEPENDS_task-core-qt-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
index 659df47..7ee575f 100644
--- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
+++ b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9 9
10RDEPENDS_${PN} += " \ 10RDEPENDS_${PN} += " \
11 task-poky-standalone-sdk-target \ 11 task-core-standalone-sdk-target \
12 qt4-embedded-mkspecs \ 12 qt4-embedded-mkspecs \
13 libqt-embeddedmultimedia4-dev \ 13 libqt-embeddedmultimedia4-dev \
14 libqt-embeddedphonon4-dev \ 14 libqt-embeddedphonon4-dev \
diff --git a/meta/recipes-sato/images/poky-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 429095e..429095e 100644
--- a/meta/recipes-sato/images/poky-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
diff --git a/meta/recipes-sato/images/core-image-sato-directdisk.bb b/meta/recipes-sato/images/core-image-sato-directdisk.bb
new file mode 100644
index 0000000..1e6aa66
--- /dev/null
+++ b/meta/recipes-sato/images/core-image-sato-directdisk.bb
@@ -0,0 +1,9 @@
1require recipes-core/images/core-image-directdisk.inc
2
3DESCRIPTION = "Sato Direct Disk Image"
4
5LICENSE = "MIT"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3"
8
9do_bootdirectdisk[depends] += "core-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/core-image-sato-live.bb b/meta/recipes-sato/images/core-image-sato-live.bb
new file mode 100644
index 0000000..9511ca6
--- /dev/null
+++ b/meta/recipes-sato/images/core-image-sato-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "Sato Bootable Live Image"
2
3require recipes-core/images/core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "core-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb b/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb
new file mode 100644
index 0000000..4c1535a
--- /dev/null
+++ b/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb
@@ -0,0 +1,9 @@
1require recipes-core/images/core-image-directdisk.inc
2
3DESCRIPTION = "Sato SDK Direct Disk Image"
4
5LICENSE = "MIT"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3"
8
9do_bootdirectdisk[depends] += "core-image-sato-sdk:do_rootfs"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-live.bb b/meta/recipes-sato/images/core-image-sato-sdk-live.bb
new file mode 100644
index 0000000..f11d895
--- /dev/null
+++ b/meta/recipes-sato/images/core-image-sato-sdk-live.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "Bootable Live Sato SDK Image"
2
3require recipes-core/images/core-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "core-image-sato-sdk:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 9f8eef9..9f8eef9 100644
--- a/meta/recipes-sato/images/poky-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
diff --git a/meta/recipes-sato/images/poky-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 35d1a53..35d1a53 100644
--- a/meta/recipes-sato/images/poky-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
diff --git a/meta/recipes-sato/images/poky-image-sato-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-directdisk.bb
deleted file mode 100644
index 9b6b96e..0000000
--- a/meta/recipes-sato/images/poky-image-sato-directdisk.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require recipes-core/images/poky-image-directdisk.inc
2
3DESCRIPTION = "Sato Direct Disk Image"
4
5LICENSE = "MIT"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
8
9do_bootdirectdisk[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sato-live.bb b/meta/recipes-sato/images/poky-image-sato-live.bb
deleted file mode 100644
index 20f7bf8..0000000
--- a/meta/recipes-sato/images/poky-image-sato-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Sato Bootable Live Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb
deleted file mode 100644
index b69780f..0000000
--- a/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require recipes-core/images/poky-image-directdisk.inc
2
3DESCRIPTION = "Sato SDK Direct Disk Image"
4
5LICENSE = "MIT"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-sdk-${MACHINE}.ext3"
8
9do_bootdirectdisk[depends] += "poky-image-sato-sdk:do_rootfs"
diff --git a/meta/recipes-sato/images/poky-image-sato-sdk-live.bb b/meta/recipes-sato/images/poky-image-sato-sdk-live.bb
deleted file mode 100644
index b5e786e..0000000
--- a/meta/recipes-sato/images/poky-image-sato-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Bootable Live Sato SDK Image"
2
3require recipes-core/images/poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-sdk-${MACHINE}.ext3"
8
9LICENSE = "MIT"
10
11do_bootimg[depends] += "poky-image-sato-sdk:do_rootfs"
diff --git a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
index 7bb26fc..2f9d6a6 100644
--- a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb
+++ b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r27" 9PR = "r27"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-apps-x11-pimlico \ 12 task-core-apps-x11-pimlico \
13 task-poky-apps-x11-pimlico-dbg \ 13 task-core-apps-x11-pimlico-dbg \
14 task-poky-apps-x11-pimlico-dev \ 14 task-core-apps-x11-pimlico-dev \
15 " 15 "
16 16
17PACKAGE_ARCH = "${MACHINE_ARCH}" 17PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -25,7 +25,7 @@ WEB ?= ""
25#WEB_c7x0 = "" 25#WEB_c7x0 = ""
26#WEB_mx31ads = "" 26#WEB_mx31ads = ""
27 27
28RDEPENDS_task-poky-apps-x11-pimlico = "\ 28RDEPENDS_task-core-apps-x11-pimlico = "\
29 eds-dbus \ 29 eds-dbus \
30 contacts \ 30 contacts \
31 dates \ 31 dates \
diff --git a/meta/recipes-sato/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb
index c10a32a..43b24d2 100644
--- a/meta/recipes-sato/tasks/task-poky-x11-sato.bb
+++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r30" 9PR = "r30"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-x11-sato \ 12 task-core-x11-sato \
13 task-poky-x11-sato-dbg \ 13 task-core-x11-sato-dbg \
14 task-poky-x11-sato-dev \ 14 task-core-x11-sato-dev \
15 " 15 "
16 16
17PACKAGE_ARCH = "${MACHINE_ARCH}" 17PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -19,7 +19,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
19ALLOW_EMPTY = "1" 19ALLOW_EMPTY = "1"
20 20
21NETWORK_MANAGER ?= "connman-gnome" 21NETWORK_MANAGER ?= "connman-gnome"
22RDEPENDS_task-poky-x11-sato = "\ 22RDEPENDS_task-core-x11-sato = "\
23 matchbox-desktop \ 23 matchbox-desktop \
24 matchbox-session-sato \ 24 matchbox-session-sato \
25 matchbox-keyboard \ 25 matchbox-keyboard \
diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-core.bb
index 4f7bc3d..a595ad7 100644
--- a/meta/recipes-sato/tasks/task-poky.bb
+++ b/meta/recipes-sato/tasks/task-core.bb
@@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r34" 9PR = "r34"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-poky-apps-console \ 12 task-core-apps-console \
13 task-poky-apps-console-dbg \ 13 task-core-apps-console-dbg \
14 task-poky-apps-console-dev \ 14 task-core-apps-console-dev \
15 task-poky-apps-x11-core \ 15 task-core-apps-x11-core \
16 task-poky-apps-x11-core-dbg \ 16 task-core-apps-x11-core-dbg \
17 task-poky-apps-x11-core-dev \ 17 task-core-apps-x11-core-dev \
18 task-poky-apps-x11-games \ 18 task-core-apps-x11-games \
19 task-poky-apps-x11-games-dbg \ 19 task-core-apps-x11-games-dbg \
20 task-poky-apps-x11-games-dev \ 20 task-core-apps-x11-games-dev \
21 task-poky-x11-base \ 21 task-core-x11-base \
22 task-poky-x11-base-dbg \ 22 task-core-x11-base-dbg \
23 task-poky-x11-base-dev \ 23 task-core-x11-base-dev \
24 " 24 "
25 25
26PACKAGE_ARCH = "${MACHINE_ARCH}" 26PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -35,14 +35,14 @@ SPLASH ?= "psplash"
35FILEMANAGER ?= "pcmanfm" 35FILEMANAGER ?= "pcmanfm"
36FILEMANAGER_mips ?= "" 36FILEMANAGER_mips ?= ""
37 37
38RDEPENDS_task-poky-apps-console = "\ 38RDEPENDS_task-core-apps-console = "\
39 avahi-daemon \ 39 avahi-daemon \
40 dbus \ 40 dbus \
41 portmap \ 41 portmap \
42 ${SPLASH}" 42 ${SPLASH}"
43 43
44 44
45RDEPENDS_task-poky-x11-base = "\ 45RDEPENDS_task-core-x11-base = "\
46 dbus \ 46 dbus \
47 pointercal \ 47 pointercal \
48 matchbox-wm \ 48 matchbox-wm \
@@ -62,12 +62,12 @@ RDEPENDS_task-poky-x11-base = "\
62 xrandr" 62 xrandr"
63 63
64 64
65RDEPENDS_task-poky-apps-x11-core = "\ 65RDEPENDS_task-core-apps-x11-core = "\
66 leafpad \ 66 leafpad \
67 ${FILEMANAGER} \ 67 ${FILEMANAGER} \
68 matchbox-terminal \ 68 matchbox-terminal \
69 screenshot" 69 screenshot"
70 70
71 71
72RDEPENDS_task-poky-apps-x11-games = "\ 72RDEPENDS_task-core-apps-x11-games = "\
73 oh-puzzles" 73 oh-puzzles"
diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image
index 1dc48dd..657784c 100755
--- a/scripts/creat-lsb-image
+++ b/scripts/creat-lsb-image
@@ -60,14 +60,14 @@ ECHO "Enter directory $IMAGE_PATH"
60cd $IMAGE_PATH 60cd $IMAGE_PATH
61 61
62#get architecture 62#get architecture
63PN=`find . -name poky-image-lsb-${MACHINE_ARCH}\*.rootfs.tar.bz2 -type f | awk -F- 'BEGIN{ max=0;} {if( NR!=0 && $5>max ) max=$5 }END{ printf "%d" ,max ;}'` 63PN=`find . -name core-image-lsb-${MACHINE_ARCH}\*.rootfs.tar.bz2 -type f | awk -F- 'BEGIN{ max=0;} {if( NR!=0 && $5>max ) max=$5 }END{ printf "%d" ,max ;}'`
64if [ "XPN" == "X" ];then 64if [ "XPN" == "X" ];then
65 ECHO "${red}Don't find lsb image on platform, Please run \"poky-image-lsb\" to generate lsb image" 65 ECHO "${red}Don't find lsb image on platform, Please run \"core-image-lsb\" to generate lsb image"
66 exit 1 66 exit 1
67fi 67fi
68 68
69if [ $PN -eq 0 ];then 69if [ $PN -eq 0 ];then
70 ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run poky-image-lsb to get lsb image" 70 ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run core-image-lsb to get lsb image"
71 exit 1 71 exit 1
72fi 72fi
73#set varible ARCH 73#set varible ARCH
@@ -125,25 +125,25 @@ else
125 ECHO "Can't find lsb test suite for ${MACHINE_ARCH}" 125 ECHO "Can't find lsb test suite for ${MACHINE_ARCH}"
126fi 126fi
127cd .. 127cd ..
128if [ -L poky-image-lsb-${MACHINE_ARCH}.ext3 ];then 128if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
129 /bin/rm poky-image-lsb-${MACHINE_ARCH}.ext3 129 /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
130 exit_check 130 exit_check
131fi 131fi
132 132
133#creat lsb image 133#creat lsb image
134if [ -f poky-image-lsb-${MACHINE_ARCH}-test.ext3 ];then 134if [ -f core-image-lsb-${MACHINE_ARCH}-test.ext3 ];then
135 if [ -d lsbtmp ];then 135 if [ -d lsbtmp ];then
136 sudo umount lsbtmp 136 sudo umount lsbtmp
137 fi 137 fi
138 ECHO "Remove old lsb image..." 138 ECHO "Remove old lsb image..."
139 /bin/rm poky-image-lsb-${MACHINE_ARCH}-test.ext3 139 /bin/rm core-image-lsb-${MACHINE_ARCH}-test.ext3
140fi 140fi
141ECHO "creat a big ext3 file for lsb image with 5G..." 141ECHO "creat a big ext3 file for lsb image with 5G..."
142dd if=/dev/zero of=poky-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000 142dd if=/dev/zero of=core-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000
143exit_check 143exit_check
144ECHO "Format ext3 image,please input \"y\"" 144ECHO "Format ext3 image,please input \"y\""
145mkfs.ext3 poky-image-lsb-${MACHINE_ARCH}-test.ext3 145mkfs.ext3 core-image-lsb-${MACHINE_ARCH}-test.ext3
146tune2fs -j poky-image-lsb-${MACHINE_ARCH}-test.ext3 146tune2fs -j core-image-lsb-${MACHINE_ARCH}-test.ext3
147 147
148 148
149ECHO "get a lsb image with lsb test suite" 149ECHO "get a lsb image with lsb test suite"
@@ -153,11 +153,11 @@ fi
153 153
154 154
155#install file system and lsb test suite to lsb image 155#install file system and lsb test suite to lsb image
156sudo mount -o loop poky-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp 156sudo mount -o loop core-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp
157exit_check 157exit_check
158 158
159ECHO " ->Install file system..." 159ECHO " ->Install file system..."
160sudo tar jxf poky-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp 160sudo tar jxf core-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp
161exit_check 161exit_check
162 162
163ECHO " ->Install lsb test suite..." 163ECHO " ->Install lsb test suite..."
@@ -181,18 +181,18 @@ exit_check
181sudo rm -rf lsbtmp 181sudo rm -rf lsbtmp
182 182
183#change file attribute 183#change file attribute
184sudo chown ${USER}:${USER} poky-image-lsb-${MACHINE_ARCH}-test.ext3 184sudo chown ${USER}:${USER} core-image-lsb-${MACHINE_ARCH}-test.ext3
185exit_check 185exit_check
186sudo chmod 755 poky-image-lsb-${MACHINE_ARCH}-test.ext3 186sudo chmod 755 core-image-lsb-${MACHINE_ARCH}-test.ext3
187exit_check 187exit_check
188 188
189#set up link 189#set up link
190if [ -L poky-image-lsb-${MACHINE_ARCH}.ext3 ];then 190if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
191ECHO "Set up link" 191ECHO "Set up link"
192 /bin/rm poky-image-lsb-${MACHINE_ARCH}.ext3 192 /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
193 exit_check 193 exit_check
194fi 194fi
195ln -s poky-image-lsb-${MACHINE_ARCH}-test.ext3 poky-image-lsb-${MACHINE_ARCH}.ext3 195ln -s core-image-lsb-${MACHINE_ARCH}-test.ext3 core-image-lsb-${MACHINE_ARCH}.ext3
196 196
197ECHO "LSB test environment is set successfully, Please run this image on platform ${MACHINE_ARCH}" 197ECHO "LSB test environment is set successfully, Please run this image on platform ${MACHINE_ARCH}"
198 198
diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir
index aabf358..c900d0e 100755
--- a/scripts/poky-setup-builddir
+++ b/scripts/poky-setup-builddir
@@ -103,8 +103,8 @@ cat <<EOM
103You can now run 'bitbake <target>' 103You can now run 'bitbake <target>'
104 104
105Common targets are: 105Common targets are:
106 poky-image-minimal 106 core-image-minimal
107 poky-image-sato 107 core-image-sato
108 meta-toolchain 108 meta-toolchain
109 meta-toolchain-sdk 109 meta-toolchain-sdk
110 110
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
index 4fa6068..4fa6068 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal
index 0fcc7bb..0fcc7bb 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
index 7a6353e..7a6353e 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
index 42b8e19..42b8e19 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
index 4fa6068..4fa6068 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal
index 0fcc7bb..0fcc7bb 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
index 7a6353e..7a6353e 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
index 42b8e19..42b8e19 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
index 4fa6068..4fa6068 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal
index 0fcc7bb..0fcc7bb 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
index 7a6353e..7a6353e 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
index 42b8e19..42b8e19 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
index 4fa6068..4fa6068 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal
index 0fcc7bb..0fcc7bb 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
index 7a6353e..7a6353e 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
index 42b8e19..42b8e19 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
index 4fa6068..4fa6068 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal
index 0fcc7bb..0fcc7bb 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
index 7a6353e..7a6353e 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
index 42b8e19..42b8e19 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
diff --git a/scripts/runqemu b/scripts/runqemu
index d155b56..894a296 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -34,7 +34,7 @@ usage() {
34 echo "" 34 echo ""
35 echo "Examples:" 35 echo "Examples:"
36 echo " $MYNAME qemuarm" 36 echo " $MYNAME qemuarm"
37 echo " $MYNAME qemux86-64 poky-image-sato ext3" 37 echo " $MYNAME qemux86-64 core-image-sato ext3"
38 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" 38 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
39 echo " $MYNAME qemux86 \"<-m 256>\"" 39 echo " $MYNAME qemux86 \"<-m 256>\""
40 exit 1 40 exit 1
@@ -234,31 +234,31 @@ machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'`
234# Defaults used when these vars need to be inferred 234# Defaults used when these vars need to be inferred
235QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin 235QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin
236QEMUX86_DEFAULT_FSTYPE=ext3 236QEMUX86_DEFAULT_FSTYPE=ext3
237QEMUX86_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 237QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
238 238
239QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin 239QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin
240QEMUX86_64_DEFAULT_FSTYPE=ext3 240QEMUX86_64_DEFAULT_FSTYPE=ext3
241QEMUX86_64_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 241QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
242 242
243QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin 243QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin
244QEMUARM_DEFAULT_FSTYPE=ext3 244QEMUARM_DEFAULT_FSTYPE=ext3
245QEMUARM_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 245QEMUARM_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
246 246
247QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin 247QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
248QEMUMIPS_DEFAULT_FSTYPE=ext3 248QEMUMIPS_DEFAULT_FSTYPE=ext3
249QEMUMIPS_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 249QEMUMIPS_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
250 250
251QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin 251QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin
252QEMUPPC_DEFAULT_FSTYPE=ext3 252QEMUPPC_DEFAULT_FSTYPE=ext3
253QEMUPPC_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" 253QEMUPPC_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
254 254
255AKITA_DEFAULT_KERNEL=zImage-akita.bin 255AKITA_DEFAULT_KERNEL=zImage-akita.bin
256AKITA_DEFAULT_FSTYPE=jffs2 256AKITA_DEFAULT_FSTYPE=jffs2
257AKITA_DEFAULT_ROOTFS="poky-image-sato" 257AKITA_DEFAULT_ROOTFS="core-image-sato"
258 258
259SPITZ_DEFAULT_KERNEL=zImage-spitz.bin 259SPITZ_DEFAULT_KERNEL=zImage-spitz.bin
260SPITZ_DEFAULT_FSTYPE=ext3 260SPITZ_DEFAULT_FSTYPE=ext3
261SPITZ_DEFAULT_ROOTFS="poky-image-sato" 261SPITZ_DEFAULT_ROOTFS="core-image-sato"
262 262
263setup_tmpdir() { 263setup_tmpdir() {
264 if [ -z "$TMPDIR" ]; then 264 if [ -z "$TMPDIR" ]; then
@@ -353,7 +353,7 @@ fi
353# FSTYPE is now set for all cases 353# FSTYPE is now set for all cases
354 354
355# Handle cases where a ROOTFS type is given instead of a filename, e.g. 355# Handle cases where a ROOTFS type is given instead of a filename, e.g.
356# poky-image-sato 356# core-image-sato
357if [ "$LAZY_ROOTFS" = "true" ]; then 357if [ "$LAZY_ROOTFS" = "true" ]; then
358 setup_tmpdir 358 setup_tmpdir
359 echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE" 359 echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE"
diff --git a/scripts/runqemu.README b/scripts/runqemu.README
index 12f1191..38f9306 100644
--- a/scripts/runqemu.README
+++ b/scripts/runqemu.README
@@ -39,7 +39,7 @@ where:
39 <zimage> is the path to a kernel (e.g. zimage-qemuarm.bin) 39 <zimage> is the path to a kernel (e.g. zimage-qemuarm.bin)
40 <filesystem> is the path to the image (e.g. filesystem-qemuarm.ext2) 40 <filesystem> is the path to the image (e.g. filesystem-qemuarm.ext2)
41 41
42It will default to the qemuarm, ext2 and the last kernel and poky-image-sdk 42It will default to the qemuarm, ext2 and the last kernel and core-image-sdk
43image built by poky. 43image built by poky.
44 44
45 45