From 6e95cb246f39e4d49d46761b9a7d51c858ac7e9d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 17:25:23 +0100 Subject: Rename poky-image-* -> core-image-* and task-poky-* -> task-core-* (From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3) Signed-off-by: Richard Purdie --- README.hardware | 20 +- meta-rt/images/core-image-minimal-rt-directdisk.bb | 15 ++ meta-rt/images/core-image-minimal-rt-live.bb | 15 ++ meta-rt/images/core-image-minimal-rt.bb | 12 + meta-rt/images/poky-image-minimal-rt-directdisk.bb | 15 -- meta-rt/images/poky-image-minimal-rt-live.bb | 15 -- meta-rt/images/poky-image-minimal-rt.bb | 12 - meta/classes/poky-image.bbclass | 94 ++++---- meta/classes/populate_sdk.bbclass | 2 +- .../conf/distro/include/distro_tracking_fields.inc | 268 ++++++++++----------- meta/recipes-bsp/qemu-config/qemu-config.bb | 2 +- meta/recipes-core/images/core-image-base.bb | 9 + meta/recipes-core/images/core-image-core.bb | 9 + meta/recipes-core/images/core-image-directdisk.inc | 8 + meta/recipes-core/images/core-image-live.inc | 21 ++ meta/recipes-core/images/core-image-minimal-dev.bb | 15 ++ .../images/core-image-minimal-directdisk.bb | 11 + .../images/core-image-minimal-initramfs.bb | 10 + .../recipes-core/images/core-image-minimal-live.bb | 11 + .../images/core-image-minimal-mtdutils.bb | 6 + meta/recipes-core/images/core-image-minimal.bb | 13 + meta/recipes-core/images/poky-image-base.bb | 9 - meta/recipes-core/images/poky-image-core.bb | 9 - meta/recipes-core/images/poky-image-directdisk.inc | 8 - meta/recipes-core/images/poky-image-live.inc | 21 -- meta/recipes-core/images/poky-image-minimal-dev.bb | 15 -- .../images/poky-image-minimal-directdisk.bb | 11 - .../images/poky-image-minimal-initramfs.bb | 10 - .../recipes-core/images/poky-image-minimal-live.bb | 11 - .../images/poky-image-minimal-mtdutils.bb | 6 - meta/recipes-core/images/poky-image-minimal.bb | 13 - meta/recipes-core/meta/meta-toolchain-gmae.bb | 2 +- meta/recipes-core/tasks/task-core-boot.bb | 35 +++ meta/recipes-core/tasks/task-core-nfs.bb | 26 ++ meta/recipes-core/tasks/task-core-sdk.bb | 89 +++++++ meta/recipes-core/tasks/task-core-ssh-dropbear.bb | 17 ++ meta/recipes-core/tasks/task-core-ssh-openssh.bb | 17 ++ .../tasks/task-core-standalone-sdk-target.bb | 16 ++ meta/recipes-core/tasks/task-core-tools.bb | 85 +++++++ meta/recipes-core/tasks/task-poky-boot.bb | 35 --- meta/recipes-core/tasks/task-poky-nfs.bb | 26 -- meta/recipes-core/tasks/task-poky-sdk.bb | 89 ------- meta/recipes-core/tasks/task-poky-ssh-dropbear.bb | 17 -- meta/recipes-core/tasks/task-poky-ssh-openssh.bb | 17 -- .../tasks/task-poky-standalone-sdk-target.bb | 16 -- meta/recipes-core/tasks/task-poky-tools.bb | 85 ------- .../installer/adt-installer/adt_installer | 4 +- .../adt-installer/scripts/adt_installer_internal | 2 +- meta/recipes-extended/images/core-image-basic.bb | 10 + meta/recipes-extended/images/core-image-lsb-dev.bb | 9 + .../recipes-extended/images/core-image-lsb-live.bb | 11 + .../images/core-image-lsb-sdk-live.bb | 11 + meta/recipes-extended/images/core-image-lsb-sdk.bb | 9 + meta/recipes-extended/images/core-image-lsb.bb | 9 + meta/recipes-extended/images/poky-image-basic.bb | 10 - meta/recipes-extended/images/poky-image-lsb-dev.bb | 9 - .../recipes-extended/images/poky-image-lsb-live.bb | 11 - .../images/poky-image-lsb-sdk-live.bb | 11 - meta/recipes-extended/images/poky-image-lsb-sdk.bb | 9 - meta/recipes-extended/images/poky-image-lsb.bb | 9 - .../libzypp/libzypp/config-release.patch | 4 +- meta/recipes-extended/tasks/task-core-basic.bb | 158 ++++++++++++ meta/recipes-extended/tasks/task-core-lsb.bb | 198 +++++++++++++++ meta/recipes-extended/tasks/task-poky-basic.bb | 158 ------------ meta/recipes-extended/tasks/task-poky-lsb.bb | 198 --------------- meta/recipes-gnome/tasks/task-core-sdk-gmae.bb | 21 ++ .../tasks/task-core-standalone-gmae-sdk-target.bb | 21 ++ meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb | 21 -- .../tasks/task-poky-standalone-gmae-sdk-target.bb | 21 -- .../clutter/clutter-gst/enable_tests.patch | 2 +- .../clutter/clutter-gtk/enable_tests.patch | 2 +- meta/recipes-graphics/images/core-image-clutter.bb | 11 + meta/recipes-graphics/images/poky-image-clutter.bb | 11 - meta/recipes-graphics/tasks/task-core-clutter.bb | 36 +++ meta/recipes-graphics/tasks/task-poky-clutter.bb | 36 --- meta/recipes-qt/tasks/task-core-qt.bb | 22 ++ meta/recipes-qt/tasks/task-poky-qt.bb | 22 -- meta/recipes-qt/tasks/task-qte-toolchain-target.bb | 2 +- meta/recipes-sato/images/core-image-sato-dev.bb | 9 + .../images/core-image-sato-directdisk.bb | 9 + meta/recipes-sato/images/core-image-sato-live.bb | 11 + .../images/core-image-sato-sdk-directdisk.bb | 9 + .../images/core-image-sato-sdk-live.bb | 11 + meta/recipes-sato/images/core-image-sato-sdk.bb | 9 + meta/recipes-sato/images/core-image-sato.bb | 9 + meta/recipes-sato/images/poky-image-sato-dev.bb | 9 - .../images/poky-image-sato-directdisk.bb | 9 - meta/recipes-sato/images/poky-image-sato-live.bb | 11 - .../images/poky-image-sato-sdk-directdisk.bb | 9 - .../images/poky-image-sato-sdk-live.bb | 11 - meta/recipes-sato/images/poky-image-sato-sdk.bb | 9 - meta/recipes-sato/images/poky-image-sato.bb | 9 - .../tasks/task-core-apps-x11-pimlico.bb | 34 +++ meta/recipes-sato/tasks/task-core-x11-sato.bb | 34 +++ meta/recipes-sato/tasks/task-core.bb | 73 ++++++ .../tasks/task-poky-apps-x11-pimlico.bb | 34 --- meta/recipes-sato/tasks/task-poky-x11-sato.bb | 34 --- meta/recipes-sato/tasks/task-poky.bb | 73 ------ scripts/creat-lsb-image | 34 +-- scripts/poky-setup-builddir | 4 +- .../scenario/qemuarm/core-image-lsb | 7 + .../scenario/qemuarm/core-image-minimal | 1 + .../scenario/qemuarm/core-image-sato | 8 + .../scenario/qemuarm/core-image-sato-sdk | 9 + .../scenario/qemuarm/poky-image-lsb | 7 - .../scenario/qemuarm/poky-image-minimal | 1 - .../scenario/qemuarm/poky-image-sato | 8 - .../scenario/qemuarm/poky-image-sato-sdk | 9 - .../scenario/qemumips/core-image-lsb | 7 + .../scenario/qemumips/core-image-minimal | 1 + .../scenario/qemumips/core-image-sato | 8 + .../scenario/qemumips/core-image-sato-sdk | 9 + .../scenario/qemumips/poky-image-lsb | 7 - .../scenario/qemumips/poky-image-minimal | 1 - .../scenario/qemumips/poky-image-sato | 8 - .../scenario/qemumips/poky-image-sato-sdk | 9 - .../scenario/qemuppc/core-image-lsb | 7 + .../scenario/qemuppc/core-image-minimal | 1 + .../scenario/qemuppc/core-image-sato | 8 + .../scenario/qemuppc/core-image-sato-sdk | 9 + .../scenario/qemuppc/poky-image-lsb | 7 - .../scenario/qemuppc/poky-image-minimal | 1 - .../scenario/qemuppc/poky-image-sato | 8 - .../scenario/qemuppc/poky-image-sato-sdk | 9 - .../scenario/qemux86-64/core-image-lsb | 7 + .../scenario/qemux86-64/core-image-minimal | 1 + .../scenario/qemux86-64/core-image-sato | 8 + .../scenario/qemux86-64/core-image-sato-sdk | 9 + .../scenario/qemux86-64/poky-image-lsb | 7 - .../scenario/qemux86-64/poky-image-minimal | 1 - .../scenario/qemux86-64/poky-image-sato | 8 - .../scenario/qemux86-64/poky-image-sato-sdk | 9 - .../scenario/qemux86/core-image-lsb | 7 + .../scenario/qemux86/core-image-minimal | 1 + .../scenario/qemux86/core-image-sato | 8 + .../scenario/qemux86/core-image-sato-sdk | 9 + .../scenario/qemux86/poky-image-lsb | 7 - .../scenario/qemux86/poky-image-minimal | 1 - .../scenario/qemux86/poky-image-sato | 8 - .../scenario/qemux86/poky-image-sato-sdk | 9 - scripts/runqemu | 18 +- scripts/runqemu.README | 2 +- 142 files changed, 1530 insertions(+), 1530 deletions(-) create mode 100644 meta-rt/images/core-image-minimal-rt-directdisk.bb create mode 100644 meta-rt/images/core-image-minimal-rt-live.bb create mode 100644 meta-rt/images/core-image-minimal-rt.bb delete mode 100644 meta-rt/images/poky-image-minimal-rt-directdisk.bb delete mode 100644 meta-rt/images/poky-image-minimal-rt-live.bb delete mode 100644 meta-rt/images/poky-image-minimal-rt.bb create mode 100644 meta/recipes-core/images/core-image-base.bb create mode 100644 meta/recipes-core/images/core-image-core.bb create mode 100644 meta/recipes-core/images/core-image-directdisk.inc create mode 100644 meta/recipes-core/images/core-image-live.inc create mode 100644 meta/recipes-core/images/core-image-minimal-dev.bb create mode 100644 meta/recipes-core/images/core-image-minimal-directdisk.bb create mode 100644 meta/recipes-core/images/core-image-minimal-initramfs.bb create mode 100644 meta/recipes-core/images/core-image-minimal-live.bb create mode 100644 meta/recipes-core/images/core-image-minimal-mtdutils.bb create mode 100644 meta/recipes-core/images/core-image-minimal.bb delete mode 100644 meta/recipes-core/images/poky-image-base.bb delete mode 100644 meta/recipes-core/images/poky-image-core.bb delete mode 100644 meta/recipes-core/images/poky-image-directdisk.inc delete mode 100644 meta/recipes-core/images/poky-image-live.inc delete mode 100644 meta/recipes-core/images/poky-image-minimal-dev.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-directdisk.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-initramfs.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-live.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-mtdutils.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal.bb create mode 100644 meta/recipes-core/tasks/task-core-boot.bb create mode 100644 meta/recipes-core/tasks/task-core-nfs.bb create mode 100644 meta/recipes-core/tasks/task-core-sdk.bb create mode 100644 meta/recipes-core/tasks/task-core-ssh-dropbear.bb create mode 100644 meta/recipes-core/tasks/task-core-ssh-openssh.bb create mode 100644 meta/recipes-core/tasks/task-core-standalone-sdk-target.bb create mode 100644 meta/recipes-core/tasks/task-core-tools.bb delete mode 100644 meta/recipes-core/tasks/task-poky-boot.bb delete mode 100644 meta/recipes-core/tasks/task-poky-nfs.bb delete mode 100644 meta/recipes-core/tasks/task-poky-sdk.bb delete mode 100644 meta/recipes-core/tasks/task-poky-ssh-dropbear.bb delete mode 100644 meta/recipes-core/tasks/task-poky-ssh-openssh.bb delete mode 100644 meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb delete mode 100644 meta/recipes-core/tasks/task-poky-tools.bb create mode 100644 meta/recipes-extended/images/core-image-basic.bb create mode 100644 meta/recipes-extended/images/core-image-lsb-dev.bb create mode 100644 meta/recipes-extended/images/core-image-lsb-live.bb create mode 100644 meta/recipes-extended/images/core-image-lsb-sdk-live.bb create mode 100644 meta/recipes-extended/images/core-image-lsb-sdk.bb create mode 100644 meta/recipes-extended/images/core-image-lsb.bb delete mode 100644 meta/recipes-extended/images/poky-image-basic.bb delete mode 100644 meta/recipes-extended/images/poky-image-lsb-dev.bb delete mode 100644 meta/recipes-extended/images/poky-image-lsb-live.bb delete mode 100644 meta/recipes-extended/images/poky-image-lsb-sdk-live.bb delete mode 100644 meta/recipes-extended/images/poky-image-lsb-sdk.bb delete mode 100644 meta/recipes-extended/images/poky-image-lsb.bb create mode 100644 meta/recipes-extended/tasks/task-core-basic.bb create mode 100644 meta/recipes-extended/tasks/task-core-lsb.bb delete mode 100644 meta/recipes-extended/tasks/task-poky-basic.bb delete mode 100644 meta/recipes-extended/tasks/task-poky-lsb.bb create mode 100644 meta/recipes-gnome/tasks/task-core-sdk-gmae.bb create mode 100644 meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb delete mode 100644 meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb delete mode 100644 meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb create mode 100644 meta/recipes-graphics/images/core-image-clutter.bb delete mode 100644 meta/recipes-graphics/images/poky-image-clutter.bb create mode 100644 meta/recipes-graphics/tasks/task-core-clutter.bb delete mode 100644 meta/recipes-graphics/tasks/task-poky-clutter.bb create mode 100644 meta/recipes-qt/tasks/task-core-qt.bb delete mode 100644 meta/recipes-qt/tasks/task-poky-qt.bb create mode 100644 meta/recipes-sato/images/core-image-sato-dev.bb create mode 100644 meta/recipes-sato/images/core-image-sato-directdisk.bb create mode 100644 meta/recipes-sato/images/core-image-sato-live.bb create mode 100644 meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb create mode 100644 meta/recipes-sato/images/core-image-sato-sdk-live.bb create mode 100644 meta/recipes-sato/images/core-image-sato-sdk.bb create mode 100644 meta/recipes-sato/images/core-image-sato.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-dev.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-directdisk.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-live.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-sdk-live.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-sdk.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato.bb create mode 100644 meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb create mode 100644 meta/recipes-sato/tasks/task-core-x11-sato.bb create mode 100644 meta/recipes-sato/tasks/task-core.bb delete mode 100644 meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb delete mode 100644 meta/recipes-sato/tasks/task-poky-x11-sato.bb delete mode 100644 meta/recipes-sato/tasks/task-poky.bb create mode 100644 scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb create mode 100644 scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal create mode 100644 scripts/qemuimage-tests/scenario/qemuarm/core-image-sato create mode 100644 scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb delete mode 100644 scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal delete mode 100644 scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato delete mode 100644 scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemumips/core-image-lsb create mode 100644 scripts/qemuimage-tests/scenario/qemumips/core-image-minimal create mode 100644 scripts/qemuimage-tests/scenario/qemumips/core-image-sato create mode 100644 scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb delete mode 100644 scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal delete mode 100644 scripts/qemuimage-tests/scenario/qemumips/poky-image-sato delete mode 100644 scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb create mode 100644 scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal create mode 100644 scripts/qemuimage-tests/scenario/qemuppc/core-image-sato create mode 100644 scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb delete mode 100644 scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal delete mode 100644 scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato delete mode 100644 scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb create mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal create mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato create mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb delete mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal delete mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato delete mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemux86/core-image-lsb create mode 100644 scripts/qemuimage-tests/scenario/qemux86/core-image-minimal create mode 100644 scripts/qemuimage-tests/scenario/qemux86/core-image-sato create mode 100644 scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb delete mode 100644 scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal delete mode 100644 scripts/qemuimage-tests/scenario/qemux86/poky-image-sato delete mode 100644 scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk diff --git a/README.hardware b/README.hardware index b2ce14661e..b895f8fa13 100644 --- a/README.hardware +++ b/README.hardware @@ -87,22 +87,22 @@ Hard Disk: 1. Build a directdisk image format. This will generate proper partition tables that will in turn be written to the physical media. For example: - $ bitbake poky-image-minimal-directdisk + $ bitbake core-image-minimal-directdisk 2. Use the "dd" utility to write the image to the raw block device. For example: - # dd if=poky-image-minimal-directdisk-atom-pc.hdddirect of=/dev/sdb + # dd if=core-image-minimal-directdisk-atom-pc.hdddirect of=/dev/sdb USB Device: 1. Build an hddimg image format. This is a simple filesystem without partition tables and is suitable for USB keys. For example: - $ bitbake poky-image-minimal-live + $ bitbake core-image-minimal-live 2. Use the "dd" utility to write the image to the raw block device. For example: - # dd if=poky-image-minimal-live-atom-pc.hddimg of=/dev/sdb + # dd if=core-image-minimal-live-atom-pc.hddimg of=/dev/sdb If the device fails to boot with "Boot error" displayed, it is likely the BIOS cannot understand the physical layout of the disk (or rather it expects a @@ -126,7 +126,7 @@ USB Device: b. Copy the contents of the poky image to the USB-ZIP mode device: - # mount -o loop poky-image-minimal-live-atom-pc.hddimg /tmp/image + # mount -o loop core-image-minimal-live-atom-pc.hddimg /tmp/image # mount /dev/sdb4 /tmp/usbkey # cp -rf /tmp/image/* /tmp/usbkey @@ -185,7 +185,7 @@ and may require modification of the NAND environment. # cp u-boot-beagleboard.bin /media/boot/u-boot.bin 3. Install the root filesystem - # tar x -C /media/root -f poky-image-$IMAGE_TYPE-beagleboard.tar.bz2 + # tar x -C /media/root -f core-image-$IMAGE_TYPE-beagleboard.tar.bz2 # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz 4. Install the kernel uImage @@ -279,11 +279,11 @@ name in all commands where appropriate. --- Preparation --- -1) Build an image (e.g. poky-image-minimal) using "routerstationpro" as the +1) Build an image (e.g. core-image-minimal) using "routerstationpro" as the MACHINE 2) Partition the USB drive so that primary partition 1 is type Linux (83). -Minimum size depends on your root image size - poky-image-minimal probably +Minimum size depends on your root image size - core-image-minimal probably only needs 8-16MB, other images will need more. # fdisk /dev/sdb @@ -304,11 +304,11 @@ only needs 8-16MB, other images will need more. # mke2fs -j /dev/sdb1 4) Mount partition 1 and then extract the contents of -tmp/deploy/images/poky-image-XXXX.tar.bz2 into it (preserving permissions). +tmp/deploy/images/core-image-XXXX.tar.bz2 into it (preserving permissions). # mount /dev/sdb1 /media/sdb1 # cd /media/sdb1 - # tar -xvjpf tmp/deploy/images/poky-image-XXXX.tar.bz2 + # tar -xvjpf tmp/deploy/images/core-image-XXXX.tar.bz2 5) Unmount the USB drive and then plug it into the board's USB port 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 0000000000..b3f35232ca --- /dev/null +++ b/meta-rt/images/core-image-minimal-rt-directdisk.bb @@ -0,0 +1,15 @@ +# +# Copyright (C) 2010 Intel Corporation. +# + +require recipes-core/images/core-image-directdisk.inc + +DESCRIPTION = "Bootable Minimal Real-Time Direct Disk Image" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-rt-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootdirectdisk[depends] += "core-image-minimal-rt:do_rootfs" + + 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 0000000000..9e0fdbaf00 --- /dev/null +++ b/meta-rt/images/core-image-minimal-rt-live.bb @@ -0,0 +1,15 @@ +# +# Copyright (C) 2010 Intel Corporation. +# + +DESCRIPTION = "Bootable Live Minimal Real-Time Linux Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-rt-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-minimal-rt:do_rootfs" diff --git a/meta-rt/images/core-image-minimal-rt.bb b/meta-rt/images/core-image-minimal-rt.bb new file mode 100644 index 0000000000..32a9b92e5a --- /dev/null +++ b/meta-rt/images/core-image-minimal-rt.bb @@ -0,0 +1,12 @@ +# +# Copyright (C) 2010 Intel Corporation. +# + +DESCRIPTION = "Minimal Real-Time Linux Image" +DEPENDS = "linux-yocto-rt" + +require recipes-core/images/core-image-minimal.bb + +IMAGE_INSTALL += "rt-tests" + +LICENSE = "MIT" 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 b68fe568b6..0000000000 --- a/meta-rt/images/poky-image-minimal-rt-directdisk.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation. -# - -require recipes-core/images/poky-image-directdisk.inc - -DESCRIPTION = "Bootable Minimal Real-Time Direct Disk Image" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-rt-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootdirectdisk[depends] += "poky-image-minimal-rt:do_rootfs" - - 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 01628dcc3f..0000000000 --- a/meta-rt/images/poky-image-minimal-rt-live.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation. -# - -DESCRIPTION = "Bootable Live Minimal Real-Time Linux Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-rt-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-minimal-rt:do_rootfs" diff --git a/meta-rt/images/poky-image-minimal-rt.bb b/meta-rt/images/poky-image-minimal-rt.bb deleted file mode 100644 index 6f5700c67a..0000000000 --- a/meta-rt/images/poky-image-minimal-rt.bb +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation. -# - -DESCRIPTION = "Minimal Real-Time Linux Image" -DEPENDS = "linux-yocto-rt" - -require recipes-core/images/poky-image-minimal.bb - -IMAGE_INSTALL += "rt-tests" - -LICENSE = "MIT" diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass index 54cf57f0db..832319a5ae 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 # IMAGE_FEATURES control content of images built with Poky. # -# By default we install task-poky-boot and task-base packages - this gives us +# By default we install task-core-boot and task-base packages - this gives us # working (console only) rootfs. # # Available IMAGE_FEATURES: @@ -31,68 +31,68 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 # POKY_BASE_INSTALL = '\ - task-poky-boot \ + task-core-boot \ task-base-extended \ - ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-poky-apps-console", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-poky-apps-console-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-poky-apps-console-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "x11-base", "task-poky-x11-base", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-poky-x11-base-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-poky-x11-base-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-poky-x11-sato", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-poky-x11-netbook", "", d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-poky-x11-netbook-dbg", "", d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-poky-x11-netbook-dev", "", d)} \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \ + ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-poky-apps-x11-games", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-poky-apps-x11-games-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-poky-apps-x11-games-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-poky-apps-x11-pimlico", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-poky-apps-x11-pimlico-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-poky-apps-x11-pimlico-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-poky-tools-debug", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-poky-tools-debug-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-poky-tools-debug-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-poky-tools-profile", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-poky-tools-profile-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-poky-tools-profile-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-poky-tools-testapps", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-poky-tools-testapps-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-poky-tools-testapps-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-poky-sdk task-poky-standalone-sdk-target", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-poky-ssh-dropbear", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-poky-ssh-dropbear-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-poky-ssh-dropbear-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \ \ - ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-poky-ssh-openssh", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-poky-ssh-openssh-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-poky-ssh-openssh-dev", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \ \ ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ - ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-poky-qt-demos", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \ ${POKY_EXTRA_INSTALL} \ ' diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass index 474b43bb9e..413eb52ac3 100644 --- a/meta/classes/populate_sdk.bbclass +++ b/meta/classes/populate_sdk.bbclass @@ -8,7 +8,7 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk" SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" -TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" +TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" RDEPENDS = "${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 542b865a0f..ebc43f5968 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" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-base="n/a" RECIPE_MAINTAINER_pn-task-base = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-clutter="green" -RECIPE_LATEST_VERSION_pn-task-poky-clutter="1.0" -RECIPE_NO_OF_PATCHES_pn-task-poky-clutter="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-poky-clutter="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-clutter="n/a" -RECIPE_MAINTAINER_pn-task-poky-clutter = "Dongxiao Xu " -DISTRO_PN_ALIAS_pn-task-poky-clutter = "Poky" - -RECIPE_STATUS_pn-task-poky-boot="green" -RECIPE_LATEST_VERSION_pn-task-poky-boot="1.0" -RECIPE_NO_OF_PATCHES_pn-task-poky-boot="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-poky-boot="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-boot="n/a" -RECIPE_MAINTAINER_pn-task-poky-boot = "Dongxiao Xu " - -RECIPE_STATUS_pn-task-poky-nfs="green" -RECIPE_LATEST_VERSION_pn-task-poky-nfs="1.0" -RECIPE_NO_OF_PATCHES_pn-task-poky-nfs="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-poky-nfs="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-nfs="n/a" -RECIPE_MAINTAINER_pn-task-poky-nfs = "Dongxiao Xu " - -RECIPE_STATUS_pn-task-poky-tools="green" -RECIPE_LATEST_VERSION_pn-task-poky-tools="1.0" -RECIPE_NO_OF_PATCHES_pn-task-poky-tools="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-poky-tools="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-tools="n/a" -RECIPE_MAINTAINER_pn-task-poky-tools = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-clutter="green" +RECIPE_LATEST_VERSION_pn-task-core-clutter="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-clutter="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-clutter="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-clutter="n/a" +RECIPE_MAINTAINER_pn-task-core-clutter = "Dongxiao Xu " +DISTRO_PN_ALIAS_pn-task-core-clutter = "Poky" + +RECIPE_STATUS_pn-task-core-boot="green" +RECIPE_LATEST_VERSION_pn-task-core-boot="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-boot="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-boot="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-boot="n/a" +RECIPE_MAINTAINER_pn-task-core-boot = "Dongxiao Xu " + +RECIPE_STATUS_pn-task-core-nfs="green" +RECIPE_LATEST_VERSION_pn-task-core-nfs="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-nfs="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a" +RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu " + +RECIPE_STATUS_pn-task-core-tools="green" +RECIPE_LATEST_VERSION_pn-task-core-tools="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-tools="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a" +RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao Xu " RECIPE_STATUS_pn-gst-meta-base="green" DISTRO_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" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-meta-base="n/a" RECIPE_MAINTAINER_pn-gst-meta-base = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-apps-x11-pimlico="green" -RECIPE_LATEST_VERSION_pn-task-poky-apps-x11-pimlico="1.0" -RECIPE_NO_OF_PATCHES_pn-task-poky-apps-x11-pimlico="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-poky-apps-x11-pimlico="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-apps-x11-pimlico="n/a" -RECIPE_MAINTAINER_pn-task-poky-apps-x11-pimlico = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-apps-x11-pimlico="green" +RECIPE_LATEST_VERSION_pn-task-core-apps-x11-pimlico="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-apps-x11-pimlico="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-apps-x11-pimlico="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-apps-x11-pimlico="n/a" +RECIPE_MAINTAINER_pn-task-core-apps-x11-pimlico = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-x11-sato="green" -RECIPE_LATEST_VERSION_pn-task-poky-x11-sato="1.0" -RECIPE_NO_OF_PATCHES_pn-task-poky-x11-sato="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-poky-x11-sato="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-poky-x11-sato="n/a" -RECIPE_MAINTAINER_pn-task-poky-x11-sato = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-x11-sato="green" +RECIPE_LATEST_VERSION_pn-task-core-x11-sato="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-x11-sato="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-x11-sato="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-x11-sato="n/a" +RECIPE_MAINTAINER_pn-task-core-x11-sato = "Dongxiao Xu " RECIPE_STATUS_pn-enchant="green" RECIPE_LATEST_VERSION_pn-enchant="1.6.0" @@ -2342,21 +2342,21 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-enchant="10 months" RECIPE_LAST_UPDATE_pn-enchant = "Aug 4, 2010" RECIPE_MAINTAINER_pn-enchant = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-sdk = "red" -RECIPE_LATEST_VERSION_pn-task-poky-sdk = "1.0" -RECIPE_MAINTAINER_pn-task-poky-sdk = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-sdk = "red" +RECIPE_LATEST_VERSION_pn-task-core-sdk = "1.0" +RECIPE_MAINTAINER_pn-task-core-sdk = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-sdk-gmae = "red" -RECIPE_LATEST_VERSION_pn-task-poky-sdk-gmae = "1.0" -RECIPE_MAINTAINER_pn-task-poky-sdk-gmae = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-sdk-gmae = "red" +RECIPE_LATEST_VERSION_pn-task-core-sdk-gmae = "1.0" +RECIPE_MAINTAINER_pn-task-core-sdk-gmae = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-standalone-gmae-sdk-target = "red" -RECIPE_LATEST_VERSION_pn-task-poky-standalone-gmae-sdk-target = "1.0" -RECIPE_MAINTAINER_pn-task-poky-standalone-gmae-sdk-target = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-standalone-gmae-sdk-target = "red" +RECIPE_LATEST_VERSION_pn-task-core-standalone-gmae-sdk-target = "1.0" +RECIPE_MAINTAINER_pn-task-core-standalone-gmae-sdk-target = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-standalone-sdk-target = "red" -RECIPE_LATEST_VERSION_pn-task-poky-standalone-sdk-target = "1.0" -RECIPE_MAINTAINER_pn-task-poky-standalone-sdk-target = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-standalone-sdk-target = "red" +RECIPE_LATEST_VERSION_pn-task-core-standalone-sdk-target = "1.0" +RECIPE_MAINTAINER_pn-task-core-standalone-sdk-target = "Dongxiao Xu " RECIPE_STATUS_pn-xournal = "red" RECIPE_LATEST_VERSION_pn-xournal = "0.4.5" @@ -2368,88 +2368,88 @@ RECIPE_LATEST_VERSION_pn-wv = "1.2.1" RECIPE_LAST_UPDATE_pn-wv = "Jan 12, 2007" RECIPE_MAINTAINER_pn-wv = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-minimal = "green" -RECIPE_LATEST_VERSION_pn-poky-image-minimal = "1.0" -RECIPE_MAINTAINER_pn-poky-image-minimal = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-minimal = "green" +RECIPE_LATEST_VERSION_pn-core-image-minimal = "1.0" +RECIPE_MAINTAINER_pn-core-image-minimal = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-minimal-directdisk = "green" -RECIPE_LATEST_VERSION_pn-poky-image-minimal-directdisk = "1.0" -RECIPE_MAINTAINER_pn-poky-image-minimal-directdisk = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-minimal-directdisk = "green" +RECIPE_LATEST_VERSION_pn-core-image-minimal-directdisk = "1.0" +RECIPE_MAINTAINER_pn-core-image-minimal-directdisk = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-minimal-initramfs = "green" -RECIPE_LATEST_VERSION_pn-poky-image-minimal-initramfs = "1.0" -RECIPE_MAINTAINER_pn-poky-image-minimal-initramfs = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-minimal-initramfs = "green" +RECIPE_LATEST_VERSION_pn-core-image-minimal-initramfs = "1.0" +RECIPE_MAINTAINER_pn-core-image-minimal-initramfs = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-minimal-live = "green" -RECIPE_LATEST_VERSION_pn-poky-image-minimal-live = "1.0" -RECIPE_MAINTAINER_pn-poky-image-minimal-live = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-minimal-live = "green" +RECIPE_LATEST_VERSION_pn-core-image-minimal-live = "1.0" +RECIPE_MAINTAINER_pn-core-image-minimal-live = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-minimal-mtdutils = "green" -RECIPE_LATEST_VERSION_pn-poky-image-minimal-mtdutils = "1.0" -RECIPE_MAINTAINER_pn-poky-image-minimal-mtdutils = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-minimal-mtdutils = "green" +RECIPE_LATEST_VERSION_pn-core-image-minimal-mtdutils = "1.0" +RECIPE_MAINTAINER_pn-core-image-minimal-mtdutils = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-basic = "green" -RECIPE_LATEST_VERSION_pn-poky-image-basic = "1.0" -RECIPE_MAINTAINER_pn-poky-image-basic = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-basic = "green" +RECIPE_LATEST_VERSION_pn-core-image-basic = "1.0" +RECIPE_MAINTAINER_pn-core-image-basic = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-sato = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-sato = "green" +RECIPE_LATEST_VERSION_pn-core-image-sato = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-sato-directdisk = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato-directdisk = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato-directdisk = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-sato-directdisk = "green" +RECIPE_LATEST_VERSION_pn-core-image-sato-directdisk = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato-directdisk = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-sato-live = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato-live = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato-live = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-sato-live = "green" +RECIPE_LATEST_VERSION_pn-core-image-sato-live = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato-live = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-lsb = "green" -RECIPE_LATEST_VERSION_pn-poky-image-lsb = "1.0" -RECIPE_MAINTAINER_pn-poky-image-lsb = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-lsb = "green" +RECIPE_LATEST_VERSION_pn-core-image-lsb = "1.0" +RECIPE_MAINTAINER_pn-core-image-lsb = "Dongxiao Xu " RECIPE_STATUS_pn-poky-sato-image-sdk = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato-sdk = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato-sdk = "Dongxiao Xu " -DISTRO_PN_ALIAS_pn-poky-image-sdk = "Poky" +RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu " +DISTRO_PN_ALIAS_pn-core-image-sdk = "Poky" RECIPE_STATUS_pn-task-poky = "green" RECIPE_LATEST_VERSION_pn-task-poky = "1.0" RECIPE_MAINTAINER_pn-task-poky = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-basic = "green" -RECIPE_LATEST_VERSION_pn-task-poky-basic = "1.0" -RECIPE_MAINTAINER_pn-task-poky-basic = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-basic = "green" +RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0" +RECIPE_MAINTAINER_pn-task-core-basic = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-lsb = "green" -RECIPE_LATEST_VERSION_pn-task-poky-lsb = "1.0" -RECIPE_MAINTAINER_pn-task-poky-lsb = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-lsb = "green" +RECIPE_LATEST_VERSION_pn-task-core-lsb = "1.0" +RECIPE_MAINTAINER_pn-task-core-lsb = "Dongxiao Xu " RECIPE_STATUS_pn-task-sdk-host = "green" RECIPE_LATEST_VERSION_pn-task-sdk-host = "1.0" RECIPE_MAINTAINER_pn-task-sdk-host = "Dongxiao Xu " -RECIPE_STATUS_pn-task-poky-qt = "green" -RECIPE_LATEST_VERSION_pn-task-poky-qt = "1.0" -RECIPE_MAINTAINER_pn-task-poky-qt = "Dongxiao Xu " +RECIPE_STATUS_pn-task-core-qt = "green" +RECIPE_LATEST_VERSION_pn-task-core-qt = "1.0" +RECIPE_MAINTAINER_pn-task-core-qt = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-base = "green" -RECIPE_LATEST_VERSION_pn-poky-image-base = "1.0" -RECIPE_MAINTAINER_pn-poky-image-base = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-base = "green" +RECIPE_LATEST_VERSION_pn-core-image-base = "1.0" +RECIPE_MAINTAINER_pn-core-image-base = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-core = "green" -RECIPE_LATEST_VERSION_pn-poky-image-core = "1.0" -RECIPE_MAINTAINER_pn-poky-image-core = "Dongxiao Xu " +RECIPE_STATUS_pn-core-image-core = "green" +RECIPE_LATEST_VERSION_pn-core-image-core = "1.0" +RECIPE_MAINTAINER_pn-core-image-core = "Dongxiao Xu " -RECIPE_STATUS_pn-poky-image-sato-sdk-live = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato-sdk-live = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato-sdk-live = "Dongxiao Xu " -DISTRO_PN_ALIAS_pn-poky-image-sato-sdk-live = "Poky" +RECIPE_STATUS_pn-core-image-sato-sdk-live = "green" +RECIPE_LATEST_VERSION_pn-core-image-sato-sdk-live = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato-sdk-live = "Dongxiao Xu " +DISTRO_PN_ALIAS_pn-core-image-sato-sdk-live = "Poky" -RECIPE_STATUS_pn-poky-image-sato-sdk-directdisk = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato-sdk-directdisk = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato-sdk-directdisk = "Dongxiao Xu " -DISTRO_PN_ALIAS_pn-poky-image-sato-sdk-directdisk = "Poky" +RECIPE_STATUS_pn-core-image-sato-sdk-directdisk = "green" +RECIPE_LATEST_VERSION_pn-core-image-sato-sdk-directdisk = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato-sdk-directdisk = "Dongxiao Xu " +DISTRO_PN_ALIAS_pn-core-image-sato-sdk-directdisk = "Poky" RECIPE_STATUS_pn-liba52="yellow" # patch investigation needed DISTRO_PN_ALIAS_pn-liba52 = "Mandriva=a52dec Debian=a52dec" @@ -5361,31 +5361,31 @@ RECIPE_LAST_UPDATE_pn-mutter = "Jan 13, 2010" RECIPE_MAINTAINER_pn-mutter = "Edwin Zhai " DISTRO_PN_ALIAS_pn-poky-feed-config-opkg = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-base = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-basic = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-core = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-lsb = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-minimal = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-minimal-directdisk = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-minimal-initramfs = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-minimal-live = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-minimal-mtdutils = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-sato = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-sato-directdisk = "Poky" -DISTRO_PN_ALIAS_pn-poky-image-sato-live = "Poky" +DISTRO_PN_ALIAS_pn-core-image-base = "Poky" +DISTRO_PN_ALIAS_pn-core-image-basic = "Poky" +DISTRO_PN_ALIAS_pn-core-image-core = "Poky" +DISTRO_PN_ALIAS_pn-core-image-lsb = "Poky" +DISTRO_PN_ALIAS_pn-core-image-minimal = "Poky" +DISTRO_PN_ALIAS_pn-core-image-minimal-directdisk = "Poky" +DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "Poky" +DISTRO_PN_ALIAS_pn-core-image-minimal-live = "Poky" +DISTRO_PN_ALIAS_pn-core-image-minimal-mtdutils = "Poky" +DISTRO_PN_ALIAS_pn-core-image-sato = "Poky" +DISTRO_PN_ALIAS_pn-core-image-sato-directdisk = "Poky" +DISTRO_PN_ALIAS_pn-core-image-sato-live = "Poky" DISTRO_PN_ALIAS_pn-task-poky = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-apps-x11-pimlico = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-basic = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-boot = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-lsb = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-nfs = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-qt = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-sdk = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-sdk-gmae = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-standalone-gmae-sdk-target = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-standalone-sdk-target = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-tools = "Poky" -DISTRO_PN_ALIAS_pn-task-poky-x11-sato = "Poky" +DISTRO_PN_ALIAS_pn-task-core-apps-x11-pimlico = "Poky" +DISTRO_PN_ALIAS_pn-task-core-basic = "Poky" +DISTRO_PN_ALIAS_pn-task-core-boot = "Poky" +DISTRO_PN_ALIAS_pn-task-core-lsb = "Poky" +DISTRO_PN_ALIAS_pn-task-core-nfs = "Poky" +DISTRO_PN_ALIAS_pn-task-core-qt = "Poky" +DISTRO_PN_ALIAS_pn-task-core-sdk = "Poky" +DISTRO_PN_ALIAS_pn-task-core-sdk-gmae = "Poky" +DISTRO_PN_ALIAS_pn-task-core-standalone-gmae-sdk-target = "Poky" +DISTRO_PN_ALIAS_pn-task-core-standalone-sdk-target = "Poky" +DISTRO_PN_ALIAS_pn-task-core-tools = "Poky" +DISTRO_PN_ALIAS_pn-task-core-x11-sato = "Poky" DISTRO_PN_ALIAS_pn-initramfs-boot = "Poky" DISTRO_PN_ALIAS_pn-initramfs-live-boot = "Poky" DISTRO_PN_ALIAS_pn-initramfs-live-install = "Poky" @@ -5452,8 +5452,8 @@ RECIPE_STATUS_pn-moblin-proto = "red" DISTRO_PN_ALIAS_pn-moblin-proto = "Poky" RECIPE_STATUS_pn-package-index = "red" DISTRO_PN_ALIAS_pn-package-index = "Poky" -RECIPE_STATUS_pn-poky-image-clutter = "red" -DISTRO_PN_ALIAS_pn-poky-image-clutter = "Poky" +RECIPE_STATUS_pn-core-image-clutter = "red" +DISTRO_PN_ALIAS_pn-core-image-clutter = "Poky" RECIPE_STATUS_pn-prism-firmware = "red" RECIPE_STATUS_pn-run-postinsts = "red" DISTRO_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 0247cf8994..e74f2dab46 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" LICENSE = "GPL" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS_${PN} = "distcc task-poky-nfs-server oprofileui-server rsync bash" +RDEPENDS_${PN} = "distcc task-core-nfs-server oprofileui-server rsync bash" PR = "r19" SRC_URI = "file://distcc.sh \ diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb new file mode 100644 index 0000000000..461b805b60 --- /dev/null +++ b/meta/recipes-core/images/core-image-base.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb new file mode 100644 index 0000000000..c232ccdc54 --- /dev/null +++ b/meta/recipes-core/images/core-image-core.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-core/images/core-image-directdisk.inc b/meta/recipes-core/images/core-image-directdisk.inc new file mode 100644 index 0000000000..64144b9abf --- /dev/null +++ b/meta/recipes-core/images/core-image-directdisk.inc @@ -0,0 +1,8 @@ +inherit boot-directdisk + +do_bootdirectdisk_prepend () { + import bb + fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) + if 'ext3' not in fstypes: + bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") +} \ No newline at end of file diff --git a/meta/recipes-core/images/core-image-live.inc b/meta/recipes-core/images/core-image-live.inc new file mode 100644 index 0000000000..2c9b3fb458 --- /dev/null +++ b/meta/recipes-core/images/core-image-live.inc @@ -0,0 +1,21 @@ +AUTO_SYSLINUXCFG = "1" +INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz" +APPEND += "root=/dev/ram0 " +TIMEOUT = "10" + +EXCLUDE_FROM_WORLD = "1" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs" + +inherit bootimg + +do_bootimg_prepend () { + import bb + fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) + if 'ext3' not in fstypes: + bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") +} + diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb new file mode 100644 index 0000000000..248d29f031 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-dev.bb @@ -0,0 +1,15 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}" + +IMAGE_FEATURES += "dev-pkgs" + +IMAGE_LINGUAS = " " + +LICENSE = "MIT" + +inherit poky-image + +# remove not needed ipkg informations +ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/images/core-image-minimal-directdisk.bb b/meta/recipes-core/images/core-image-minimal-directdisk.bb new file mode 100644 index 0000000000..ed23e45708 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-directdisk.bb @@ -0,0 +1,11 @@ +require core-image-directdisk.inc + +DESCRIPTION = "Minimal Bootable Direct Disk Image" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootdirectdisk[depends] += "core-image-minimal:do_rootfs" + + diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb new file mode 100644 index 0000000000..3da4a952f7 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -0,0 +1,10 @@ +# Simple initramfs image. Mostly used for live images. + +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" + +export IMAGE_BASENAME = "core-image-minimal-initramfs" +IMAGE_LINGUAS = "" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-core/images/core-image-minimal-live.bb b/meta/recipes-core/images/core-image-minimal-live.bb new file mode 100644 index 0000000000..0ce2afb2e8 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Minimal Bootable Live Image" + +require core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-minimal:do_rootfs" diff --git a/meta/recipes-core/images/core-image-minimal-mtdutils.bb b/meta/recipes-core/images/core-image-minimal-mtdutils.bb new file mode 100644 index 0000000000..adabaa400a --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-mtdutils.bb @@ -0,0 +1,6 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# +require core-image-minimal.bb + +IMAGE_INSTALL += "mtd-utils" diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb new file mode 100644 index 0000000000..3aae04edde --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal.bb @@ -0,0 +1,13 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" + +IMAGE_LINGUAS = " " + +LICENSE = "MIT" + +inherit poky-image + +# remove not needed ipkg informations +ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/images/poky-image-base.bb b/meta/recipes-core/images/poky-image-base.bb deleted file mode 100644 index 461b805b60..0000000000 --- a/meta/recipes-core/images/poky-image-base.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-core/images/poky-image-core.bb b/meta/recipes-core/images/poky-image-core.bb deleted file mode 100644 index c232ccdc54..0000000000 --- a/meta/recipes-core/images/poky-image-core.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-core/images/poky-image-directdisk.inc b/meta/recipes-core/images/poky-image-directdisk.inc deleted file mode 100644 index 64144b9abf..0000000000 --- a/meta/recipes-core/images/poky-image-directdisk.inc +++ /dev/null @@ -1,8 +0,0 @@ -inherit boot-directdisk - -do_bootdirectdisk_prepend () { - import bb - fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) - if 'ext3' not in fstypes: - bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") -} \ No newline at end of file diff --git a/meta/recipes-core/images/poky-image-live.inc b/meta/recipes-core/images/poky-image-live.inc deleted file mode 100644 index a1b0e1a3dc..0000000000 --- a/meta/recipes-core/images/poky-image-live.inc +++ /dev/null @@ -1,21 +0,0 @@ -AUTO_SYSLINUXCFG = "1" -INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" -APPEND += "root=/dev/ram0 " -TIMEOUT = "10" - -EXCLUDE_FROM_WORLD = "1" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs" - -inherit bootimg - -do_bootimg_prepend () { - import bb - fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) - if 'ext3' not in fstypes: - bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") -} - diff --git a/meta/recipes-core/images/poky-image-minimal-dev.bb b/meta/recipes-core/images/poky-image-minimal-dev.bb deleted file mode 100644 index c64b657204..0000000000 --- a/meta/recipes-core/images/poky-image-minimal-dev.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# -IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}" - -IMAGE_FEATURES += "dev-pkgs" - -IMAGE_LINGUAS = " " - -LICENSE = "MIT" - -inherit poky-image - -# remove not needed ipkg informations -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/images/poky-image-minimal-directdisk.bb b/meta/recipes-core/images/poky-image-minimal-directdisk.bb deleted file mode 100644 index 18d993e542..0000000000 --- a/meta/recipes-core/images/poky-image-minimal-directdisk.bb +++ /dev/null @@ -1,11 +0,0 @@ -require poky-image-directdisk.inc - -DESCRIPTION = "Minimal Bootable Direct Disk Image" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootdirectdisk[depends] += "poky-image-minimal:do_rootfs" - - diff --git a/meta/recipes-core/images/poky-image-minimal-initramfs.bb b/meta/recipes-core/images/poky-image-minimal-initramfs.bb deleted file mode 100644 index a94e71218f..0000000000 --- a/meta/recipes-core/images/poky-image-minimal-initramfs.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Simple initramfs image. Mostly used for live images. - -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" - -export IMAGE_BASENAME = "poky-image-minimal-initramfs" -IMAGE_LINGUAS = "" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-core/images/poky-image-minimal-live.bb b/meta/recipes-core/images/poky-image-minimal-live.bb deleted file mode 100644 index f3d3638ee6..0000000000 --- a/meta/recipes-core/images/poky-image-minimal-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Minimal Bootable Live Image" - -require poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-minimal:do_rootfs" diff --git a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb b/meta/recipes-core/images/poky-image-minimal-mtdutils.bb deleted file mode 100644 index d786131d98..0000000000 --- a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright (C) 2008 OpenedHand Ltd. -# -require poky-image-minimal.bb - -IMAGE_INSTALL += "mtd-utils" diff --git a/meta/recipes-core/images/poky-image-minimal.bb b/meta/recipes-core/images/poky-image-minimal.bb deleted file mode 100644 index 6a641f3b84..0000000000 --- a/meta/recipes-core/images/poky-image-minimal.bb +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# -IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" - -IMAGE_LINGUAS = " " - -LICENSE = "MIT" - -inherit poky-image - -# remove not needed ipkg informations -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb index 595aba3030..4f5501e0a5 100644 --- a/meta/recipes-core/meta/meta-toolchain-gmae.bb +++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb @@ -1,4 +1,4 @@ -TOOLCHAIN_TARGET_GMAETASK ?= "task-poky-standalone-gmae-sdk-target task-poky-standalone-gmae-sdk-target-dbg" +TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" PROVIDES = "meta-toolchain-sdk" diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb new file mode 100644 index 0000000000..5aea77169f --- /dev/null +++ b/meta/recipes-core/tasks/task-core-boot.bb @@ -0,0 +1,35 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PACKAGE_ARCH = "${MACHINE_ARCH}" +DEPENDS = "virtual/kernel" +ALLOW_EMPTY = "1" +PR = "r7" + +# +# Set by the machine configuration with packages essential for device bootup +# +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +RDEPENDS_task-core-boot = "\ + base-files \ + base-passwd \ + busybox \ + initscripts \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ + modutils-initscripts \ + netbase \ + sysvinit \ + tinylogin \ + udev \ + ${VIRTUAL-RUNTIME_update-alternatives} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" + +RRECOMMENDS_task-core-boot = "\ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb new file mode 100644 index 0000000000..d5d8291f76 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -0,0 +1,26 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# + +DESCRIPTION = "NFS tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + task-core-nfs-server \ + task-core-nfs-server-dbg \ + task-core-nfs-server-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-nfs-server = "\ + nfs-utils" + +# rpcinfo can be useful but only with glibc images +GLIBC_DEPENDENCIES = "glibc-utils" + +RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}" diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb new file mode 100644 index 0000000000..a158509b2d --- /dev/null +++ b/meta/recipes-core/tasks/task-core-sdk.bb @@ -0,0 +1,89 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Software Development Tasks for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +DEPENDS = "task-poky" +PR = "r7" + +ALLOW_EMPTY = "1" +#PACKAGEFUNCS =+ 'generate_sdk_pkgs' + +PACKAGES = "\ + task-core-sdk \ + task-core-sdk-dbg \ + task-core-sdk-dev" + +RDEPENDS_task-core-sdk = "\ + autoconf \ + automake \ + binutils \ + binutils-symlinks \ + coreutils \ + cpp \ + cpp-symlinks \ + diffutils \ + gcc \ + gcc-symlinks \ + g++ \ + g++-symlinks \ + gettext \ + make \ + intltool \ + libstdc++ \ + libstdc++-dev \ + libtool \ + perl-module-re \ + perl-module-text-wrap \ + pkgconfig \ + findutils \ + quilt \ + less \ + distcc \ + ldd \ + file \ + tcl" + +#python generate_sdk_pkgs () { +# poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES'] +# pkgs = bb.data.getVar('PACKAGES', d, 1).split() +# for pkg in poky_pkgs.split(): +# newpkg = pkg.replace('task-poky', 'task-core-sdk') +# +# # for each of the task packages, add a corresponding sdk task +# pkgs.append(newpkg) +# +# # for each sdk task, take the rdepends of the non-sdk task, and turn +# # that into rrecommends upon the -dev versions of those, not unlike +# # the package depchain code +# spkgdata = read_subpkgdata(pkg, d) +# +# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') +# rreclist = [] +# +# for depend in rdepends: +# split_depend = depend.split(' (') +# name = split_depend[0].strip() +# if packaged('%s-dev' % name, d): +# rreclist.append('%s-dev' % name) +# else: +# deppkgdata = read_subpkgdata(name, d) +# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') +# for depend in rdepends2: +# split_depend = depend.split(' (') +# name = split_depend[0].strip() +# if packaged('%s-dev' % name, d): +# rreclist.append('%s-dev' % name) +# +# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' +# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) +# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) +# +# # bb.note('pkgs is %s' % pkgs) +# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) +#} +# +#PACKAGES_DYNAMIC = "task-core-sdk-*" diff --git a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb new file mode 100644 index 0000000000..1e7402e11f --- /dev/null +++ b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Dropbear SSH task for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + task-core-ssh-dropbear \ + task-core-ssh-dropbear-dbg \ + task-core-ssh-dropbear-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-ssh-dropbear = "dropbear" +RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg" +RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev" diff --git a/meta/recipes-core/tasks/task-core-ssh-openssh.bb b/meta/recipes-core/tasks/task-core-ssh-openssh.bb new file mode 100644 index 0000000000..794399a2b8 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-ssh-openssh.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "OpenSSH SSH task for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + task-core-ssh-openssh \ + task-core-ssh-openssh-dbg \ + task-core-ssh-openssh-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-ssh-openssh = "openssh" +RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg" +RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev" diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb new file mode 100644 index 0000000000..3835ac7d6a --- /dev/null +++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Target packages for the standalone SDK" +PR = "r6" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +ALLOW_EMPTY = "1" + +PACKAGES = "${PN} ${PN}-dbg" + +RDEPENDS_${PN} = "\ + libgcc \ + libgcc-dev \ + libstdc++ \ + libstdc++-dev \ + ${LIBC_DEPENDENCIES} \ + " diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb new file mode 100644 index 0000000000..958dff12a0 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-tools.bb @@ -0,0 +1,85 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# + +DESCRIPTION = "Tools tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r8" + +PACKAGES = "\ + task-core-tools-debug \ + task-core-tools-debug-dbg \ + task-core-tools-debug-dev \ + task-core-tools-profile \ + task-core-tools-profile-dbg \ + task-core-tools-profile-dev \ + task-core-tools-testapps \ + task-core-tools-testapps-dbg \ + task-core-tools-testapps-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +# kexec-tools doesn't work on Mips +KEXECTOOLS ?= "kexec-tools" +KEXECTOOLS_mips ?= "" +KEXECTOOLS_mipsel ?= "" +KEXECTOOLS_powerpc ?= "" + +RDEPENDS_task-core-tools-debug = "\ + gdb \ + gdbserver \ + tcf-agent \ + rsync \ + strace" + +RDEPENDS_task-core-tools-profile = "\ + oprofile \ + oprofileui-server \ + powertop \ + latencytop \ + lttng-control \ + lttng-viewer" + +RRECOMMENDS_task-core-tools-profile = "\ + perf \ + trace-cmd \ + kernel-module-oprofile \ + blktrace \ + sysprof \ + " + +# exmap-console +# exmap-server + +# At present we only build lttng-ust on +# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu +# (which is required by lttng-ust) may not build on other platforms, like +# MIPS and qemu ARMv5te that poky uses now. +RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap" + +RDEPENDS_task-core-tools-testapps = "\ + blktool \ + fstests \ + tslib-calibrate \ + tslib-tests \ + lrzsz \ + ${KEXECTOOLS} \ + alsa-utils-amixer \ + alsa-utils-aplay \ + owl-video \ + gst-meta-video \ + gst-meta-audio \ + x11perf \ + xrestop \ + xwininfo \ + xprop \ + xvideo-tests" diff --git a/meta/recipes-core/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-poky-boot.bb deleted file mode 100644 index 7166761ce4..0000000000 --- a/meta/recipes-core/tasks/task-poky-boot.bb +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" -PR = "r7" - -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - -RDEPENDS_task-poky-boot = "\ - base-files \ - base-passwd \ - busybox \ - initscripts \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ - modutils-initscripts \ - netbase \ - sysvinit \ - tinylogin \ - udev \ - ${VIRTUAL-RUNTIME_update-alternatives} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_task-poky-boot = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/tasks/task-poky-nfs.bb b/meta/recipes-core/tasks/task-poky-nfs.bb deleted file mode 100644 index a18d2e3ab8..0000000000 --- a/meta/recipes-core/tasks/task-poky-nfs.bb +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2008 OpenedHand Ltd. -# - -DESCRIPTION = "NFS tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-poky-nfs-server \ - task-poky-nfs-server-dbg \ - task-poky-nfs-server-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-nfs-server = "\ - nfs-utils" - -# rpcinfo can be useful but only with glibc images -GLIBC_DEPENDENCIES = "glibc-utils" - -RRECOMMENDS_task-poky-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" -RRECOMMENDS_task-poky-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}" diff --git a/meta/recipes-core/tasks/task-poky-sdk.bb b/meta/recipes-core/tasks/task-poky-sdk.bb deleted file mode 100644 index b1e52c96ca..0000000000 --- a/meta/recipes-core/tasks/task-poky-sdk.bb +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Software Development Tasks for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS = "task-poky" -PR = "r7" - -ALLOW_EMPTY = "1" -#PACKAGEFUNCS =+ 'generate_sdk_pkgs' - -PACKAGES = "\ - task-poky-sdk \ - task-poky-sdk-dbg \ - task-poky-sdk-dev" - -RDEPENDS_task-poky-sdk = "\ - autoconf \ - automake \ - binutils \ - binutils-symlinks \ - coreutils \ - cpp \ - cpp-symlinks \ - diffutils \ - gcc \ - gcc-symlinks \ - g++ \ - g++-symlinks \ - gettext \ - make \ - intltool \ - libstdc++ \ - libstdc++-dev \ - libtool \ - perl-module-re \ - perl-module-text-wrap \ - pkgconfig \ - findutils \ - quilt \ - less \ - distcc \ - ldd \ - file \ - tcl" - -#python generate_sdk_pkgs () { -# poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES'] -# pkgs = bb.data.getVar('PACKAGES', d, 1).split() -# for pkg in poky_pkgs.split(): -# newpkg = pkg.replace('task-poky', 'task-poky-sdk') -# -# # for each of the task packages, add a corresponding sdk task -# pkgs.append(newpkg) -# -# # for each sdk task, take the rdepends of the non-sdk task, and turn -# # that into rrecommends upon the -dev versions of those, not unlike -# # the package depchain code -# spkgdata = read_subpkgdata(pkg, d) -# -# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') -# rreclist = [] -# -# for depend in rdepends: -# split_depend = depend.split(' (') -# name = split_depend[0].strip() -# if packaged('%s-dev' % name, d): -# rreclist.append('%s-dev' % name) -# else: -# deppkgdata = read_subpkgdata(name, d) -# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') -# for depend in rdepends2: -# split_depend = depend.split(' (') -# name = split_depend[0].strip() -# if packaged('%s-dev' % name, d): -# rreclist.append('%s-dev' % name) -# -# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' -# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) -# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) -# -# # bb.note('pkgs is %s' % pkgs) -# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) -#} -# -#PACKAGES_DYNAMIC = "task-poky-sdk-*" diff --git a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb b/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb deleted file mode 100644 index 4f2ab4425d..0000000000 --- a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Dropbear SSH task for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-poky-ssh-dropbear \ - task-poky-ssh-dropbear-dbg \ - task-poky-ssh-dropbear-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-ssh-dropbear = "dropbear" -RDEPENDS_task-poky-ssh-dropbear-dbg = "dropbear-dbg" -RDEPENDS_task-poky-ssh-dropbear-dev = "dropbear-dev" diff --git a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb b/meta/recipes-core/tasks/task-poky-ssh-openssh.bb deleted file mode 100644 index 5f828b55b9..0000000000 --- a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "OpenSSH SSH task for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-poky-ssh-openssh \ - task-poky-ssh-openssh-dbg \ - task-poky-ssh-openssh-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-ssh-openssh = "openssh" -RDEPENDS_task-poky-ssh-openssh-dbg = "openssh-dbg" -RDEPENDS_task-poky-ssh-openssh-dev = "openssh-dev" diff --git a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb deleted file mode 100644 index 3835ac7d6a..0000000000 --- a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Target packages for the standalone SDK" -PR = "r6" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -ALLOW_EMPTY = "1" - -PACKAGES = "${PN} ${PN}-dbg" - -RDEPENDS_${PN} = "\ - libgcc \ - libgcc-dev \ - libstdc++ \ - libstdc++-dev \ - ${LIBC_DEPENDENCIES} \ - " diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-poky-tools.bb deleted file mode 100644 index 29f5d4afa1..0000000000 --- a/meta/recipes-core/tasks/task-poky-tools.bb +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (C) 2008 OpenedHand Ltd. -# - -DESCRIPTION = "Tools tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r8" - -PACKAGES = "\ - task-poky-tools-debug \ - task-poky-tools-debug-dbg \ - task-poky-tools-debug-dev \ - task-poky-tools-profile \ - task-poky-tools-profile-dbg \ - task-poky-tools-profile-dev \ - task-poky-tools-testapps \ - task-poky-tools-testapps-dbg \ - task-poky-tools-testapps-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -# kexec-tools doesn't work on Mips -KEXECTOOLS ?= "kexec-tools" -KEXECTOOLS_mips ?= "" -KEXECTOOLS_mipsel ?= "" -KEXECTOOLS_powerpc ?= "" - -RDEPENDS_task-poky-tools-debug = "\ - gdb \ - gdbserver \ - tcf-agent \ - rsync \ - strace" - -RDEPENDS_task-poky-tools-profile = "\ - oprofile \ - oprofileui-server \ - powertop \ - latencytop \ - lttng-control \ - lttng-viewer" - -RRECOMMENDS_task-poky-tools-profile = "\ - perf \ - trace-cmd \ - kernel-module-oprofile \ - blktrace \ - sysprof \ - " - -# exmap-console -# exmap-server - -# At present we only build lttng-ust on -# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu -# (which is required by lttng-ust) may not build on other platforms, like -# MIPS and qemu ARMv5te that poky uses now. -RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust systemtap" - -RDEPENDS_task-poky-tools-testapps = "\ - blktool \ - fstests \ - tslib-calibrate \ - tslib-tests \ - lrzsz \ - ${KEXECTOOLS} \ - alsa-utils-amixer \ - alsa-utils-aplay \ - owl-video \ - gst-meta-video \ - gst-meta-audio \ - x11perf \ - xrestop \ - xwininfo \ - xprop \ - xvideo-tests" diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index d7a40c2479..ea36674d15 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() check_result for image_type in $select_rootfs; do - #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" - filename="poky-image-$image_type-qemu$target.tar.bz2" + #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-qemu$1.tar.bz2" + filename="core-image-$image_type-qemu$target.tar.bz2" download_file qemu$1/$filename check_result 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 65b1b54c72..0fd9e47e98 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_ qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'` -sysroot_image_name="poky-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" +sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb new file mode 100644 index 0000000000..86972c3660 --- /dev/null +++ b/meta/recipes-extended/images/core-image-basic.bb @@ -0,0 +1,10 @@ +IMAGE_FEATURES += "apps-console-core ssh-server-openssh" + +IMAGE_INSTALL = "\ + task-core-boot \ + task-core-basic \ + " + +# ${POKY_BASE_INSTALL} + +inherit poky-image diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb new file mode 100644 index 0000000000..86baf23de1 --- /dev/null +++ b/meta/recipes-extended/images/core-image-lsb-dev.bb @@ -0,0 +1,9 @@ +IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" + +IMAGE_INSTALL = "\ + ${POKY_BASE_INSTALL} \ + task-core-basic \ + task-core-lsb \ + " + +inherit poky-image diff --git a/meta/recipes-extended/images/core-image-lsb-live.bb b/meta/recipes-extended/images/core-image-lsb-live.bb new file mode 100644 index 0000000000..72f10f78fe --- /dev/null +++ b/meta/recipes-extended/images/core-image-lsb-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "LSB Bootable Live Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-lsb:do_rootfs" diff --git a/meta/recipes-extended/images/core-image-lsb-sdk-live.bb b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb new file mode 100644 index 0000000000..b01ae060f1 --- /dev/null +++ b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "LSB SDK Bootable Live Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-sdk-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-lsb-sdk:do_rootfs" diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb new file mode 100644 index 0000000000..74ad1d2d8c --- /dev/null +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb @@ -0,0 +1,9 @@ +IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkgs ssh-server-openssh" + +IMAGE_INSTALL = "\ + ${POKY_BASE_INSTALL} \ + task-core-basic \ + task-core-lsb \ + " + +inherit poky-image diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb new file mode 100644 index 0000000000..63180f5613 --- /dev/null +++ b/meta/recipes-extended/images/core-image-lsb.bb @@ -0,0 +1,9 @@ +IMAGE_FEATURES += "apps-console-core ssh-server-openssh" + +IMAGE_INSTALL = "\ + ${POKY_BASE_INSTALL} \ + task-core-basic \ + task-core-lsb \ + " + +inherit poky-image diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/poky-image-basic.bb deleted file mode 100644 index 76d5dc2c7a..0000000000 --- a/meta/recipes-extended/images/poky-image-basic.bb +++ /dev/null @@ -1,10 +0,0 @@ -IMAGE_FEATURES += "apps-console-core ssh-server-openssh" - -IMAGE_INSTALL = "\ - task-poky-boot \ - task-poky-basic \ - " - -# ${POKY_BASE_INSTALL} - -inherit poky-image diff --git a/meta/recipes-extended/images/poky-image-lsb-dev.bb b/meta/recipes-extended/images/poky-image-lsb-dev.bb deleted file mode 100644 index 578fbd0f06..0000000000 --- a/meta/recipes-extended/images/poky-image-lsb-dev.bb +++ /dev/null @@ -1,9 +0,0 @@ -IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" - -IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ - task-poky-basic \ - task-poky-lsb \ - " - -inherit poky-image diff --git a/meta/recipes-extended/images/poky-image-lsb-live.bb b/meta/recipes-extended/images/poky-image-lsb-live.bb deleted file mode 100644 index baa9ea0e4f..0000000000 --- a/meta/recipes-extended/images/poky-image-lsb-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "LSB Bootable Live Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-lsb:do_rootfs" diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb b/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb deleted file mode 100644 index 370780a062..0000000000 --- a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "LSB SDK Bootable Live Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-sdk-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-lsb-sdk:do_rootfs" diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk.bb b/meta/recipes-extended/images/poky-image-lsb-sdk.bb deleted file mode 100644 index 967bb023d3..0000000000 --- a/meta/recipes-extended/images/poky-image-lsb-sdk.bb +++ /dev/null @@ -1,9 +0,0 @@ -IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkgs ssh-server-openssh" - -IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ - task-poky-basic \ - task-poky-lsb \ - " - -inherit poky-image diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/poky-image-lsb.bb deleted file mode 100644 index 33532eac24..0000000000 --- a/meta/recipes-extended/images/poky-image-lsb.bb +++ /dev/null @@ -1,9 +0,0 @@ -IMAGE_FEATURES += "apps-console-core ssh-server-openssh" - -IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ - task-poky-basic \ - task-poky-lsb \ - " - -inherit poky-image diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch index 9128237755..e5963dfc3b 100644 --- a/meta/recipes-extended/libzypp/libzypp/config-release.patch +++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch @@ -3,7 +3,7 @@ Configure distro version package We need to configure a package that the system can use to determine the system distribution version. -Hack: for now set to task-poky-rpm. +Hack: for now set to task-core-rpm. Signed-off-by: Mark Hatle @@ -15,7 +15,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc std::string ZConfig::distroverpkg() const - { return "redhat-release"; } -+ { return "task-poky-rpm"; } ++ { return "task-core-rpm"; } /////////////////////////////////////////////////////////////////// diff --git a/meta/recipes-extended/tasks/task-core-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb new file mode 100644 index 0000000000..e2a37d1160 --- /dev/null +++ b/meta/recipes-extended/tasks/task-core-basic.bb @@ -0,0 +1,158 @@ +# +# Copyright (C) 2010 Intel Corporation +# + +DESCRIPTION = "Create Basic Image Tasks" +PR = "r3" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGES = "\ + task-core-basic \ + task-core-base-utils \ + task-core-base-utils-dbg \ + task-core-base-utils-dev \ + task-core-basic-libs \ + task-core-basic-libs-dbg \ + task-core-basic-libs-dev \ + task-core-basic-utils \ + task-core-basic-utils-dbg \ + task-core-basic-utils-dev \ + task-core-basic-extended \ + task-core-basic-extended-dbg \ + task-core-basic-extended-dev \ + task-core-dev-utils \ + task-core-dev-utils-dbg \ + task-core-dev-utils-dev \ + task-core-multiuser \ + task-core-multiuser-dbg \ + task-core-multiuser-dev \ + task-core-initscripts \ + task-core-initscripts-dbg \ + task-core-initscripts-dev \ + task-core-rpm \ + task-core-rpm-dbg \ + task-core-rpm-dev \ + task-core-sys-services \ + task-core-sys-services-dbg \ + task-core-sys-services-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-basic = "\ + task-core-base-utils \ + task-core-basic-libs \ + task-core-basic-utils \ + task-core-basic-extended \ + task-core-dev-utils \ + task-core-multiuser \ + task-core-initscripts \ + task-core-rpm \ + task-core-sys-services \ + " + +RDEPENDS_task-core-base-utils = "\ + busybox \ + " + +RDEPENDS_task-core-basic-libs = "\ + glib-2.0 \ + " + +RDEPENDS_task-core-basic-utils = "\ + bash \ + acl \ + attr \ + bc \ + coreutils \ + cpio \ + e2fsprogs \ + ed \ + file \ + findutils \ + gawk \ + gmp \ + grep \ + makedevs \ + mc \ + mktemp \ + ncurses \ + net-tools \ + pax \ + popt \ + procps \ + psmisc \ + sed \ + tar \ + time \ + udev \ + util-linux \ + zlib \ + " + +RDEPENDS_task-core-basic-extended = "\ + iproute2 \ + iputils \ + iptables \ + module-init-tools \ + openssl \ + " + +RDEPENDS_task-core-dev-utils = "\ + byacc \ + diffutils \ + m4 \ + make \ + patch \ + " + +RDEPENDS_task-core-initscripts = "\ + initscripts \ + sysvinit \ + ethtool \ + mingetty \ + sysklogd \ + " + +RDEPENDS_task-core-multiuser = "\ + cracklib \ + gzip \ + libuser \ + libpam \ + shadow \ + sudo \ + " + +RDEPENDS_task-core-rpm = "\ + beecrypt \ + rpm \ + zypper \ + " + +RDEPENDS_task-core-sys-services = "\ + at \ + bzip2 \ + cronie \ + dbus \ + dbus-glib \ + python-dbus \ + elfutils \ + gzip \ + hal \ + less \ + libcap \ + libevent \ + lighttpd \ + logrotate \ + nfs-utils \ + pciutils \ + libpcre \ + portmap \ + rpcbind \ + sysfsutils \ + tcp-wrappers \ + tzdata \ + " + diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb new file mode 100644 index 0000000000..ef8acb1359 --- /dev/null +++ b/meta/recipes-extended/tasks/task-core-lsb.bb @@ -0,0 +1,198 @@ +# +# Copyright (C) 2010 Intel Corporation +# + +DESCRIPTION = "Create Small Image Tasks" +PR = "r3" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGES = "\ + task-core-lsb \ + task-core-sys-extended \ + task-core-sys-extended-dbg \ + task-core-sys-extended-dev \ + task-core-db \ + task-core-db-dbg \ + task-core-db-dev \ + task-core-misc \ + task-core-misc-dbg \ + task-core-misc-dev \ + task-core-perl \ + task-core-perl-dbg \ + task-core-perl-dev \ + task-core-python \ + task-core-python-dbg \ + task-core-python-dev \ + task-core-tcl \ + task-core-tcl-dbg \ + task-core-tcl-dev \ + task-core-lsb-perl-add \ + task-core-lsb-python-add \ + task-core-lsb-graphic-add \ + task-core-lsb-runtime-add \ + task-core-lsb-command-add \ + " + + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-lsb = "\ + task-core-sys-extended \ + task-core-db \ + task-core-misc \ + task-core-perl \ + task-core-python \ + task-core-tcl \ + task-core-lsb-perl-add \ + task-core-lsb-python-add \ + task-core-lsb-graphic-add \ + task-core-lsb-runtime-add \ + task-core-lsb-command-add \ + " + +RDEPENDS_task-core-sys-extended = "\ + binutils \ + chkconfig \ + curl \ + dhcp-client \ + diffutils \ + gamin \ + hdparm \ + libaio \ + libxml2 \ + lrzsz \ + lzo \ + mc \ + mdadm \ + minicom \ + neon \ + parted \ + pth \ + quota \ + screen \ + setserial \ + sysstat \ + unzip \ + watchdog \ + which \ + xinetd \ + zip \ + " + +RDEPENDS_task-core-db = "\ + db \ + sqlite3 \ + " + +RDEPENDS_task-core-perl = "\ + gdbm \ + perl \ + zlib \ + " + + +RDEPENDS_task-core-python = "\ + expat \ + gdbm \ + gmp \ + ncurses \ + openssl \ + python \ + readline \ + zip \ + " + +RDEPENDS_task-core-tcl = "\ + tcl \ + " + +RDEPENDS_task-core-misc = "\ + elfutils \ + gettext \ + groff \ + lsb \ + lsbsetup \ + lsof \ + man \ + man-pages \ + ncurses \ + strace \ + libusb1 \ + usbutils \ + zlib \ + " + +RDEPENDS_task-core-lsb-command-add = "\ + localedef \ + fontconfig-utils \ + mailx \ + msmtp \ + chkconfig \ +" +# cups + +RDEPENDS_task-core-lsb-perl-add = "\ + perl-modules \ + perl-dev \ + perl-misc \ + perl-pod \ +" + +RDEPENDS_task-core-lsb-python-add = "\ + python-modules \ + python-misc \ +" + +RDEPENDS_task-core-lsb-graphic-add = "\ + libqtcore4 \ + libqtgui4 \ + libqtsql4 \ + libqtsvg4 \ + libqtxml4 \ + libqtnetwork4 \ + libxt \ + libxxf86vm \ + libdrm \ + libglu \ + libxi \ + libxtst \ + qt4-plugin-sqldriver-sqlite \ + libx11-locale \ + xorg-minimal-fonts \ + gdk-pixbuf-loader-ico \ + gdk-pixbuf-loader-bmp \ + gdk-pixbuf-loader-ani \ +" + +RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\ + libqtopengl4 \ +" +RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\ + libqtopengl4 \ +" +RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\ + libqtopengl4 \ +" + +# mesa-dri + +RDEPENDS_task-core-lsb-runtime-add = "\ + ldd \ + pam-plugin-wheel \ + e2fsprogs-mke2fs \ + mkfontdir \ + liburi-perl \ + libxml-parser-perl \ + libxml-perl \ + eglibc-localedatas \ + eglibc-gconvs \ + eglibc-charmaps \ + eglibc-binaries \ + eglibc-localedata-posix \ + eglibc-extra-nss \ + eglibc-pcprofile \ + eglibc-pic \ + eglibc-utils \ +" diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb deleted file mode 100644 index 68c996dc88..0000000000 --- a/meta/recipes-extended/tasks/task-poky-basic.bb +++ /dev/null @@ -1,158 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation -# - -DESCRIPTION = "Create Basic Image Tasks" -PR = "r3" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGES = "\ - task-poky-basic \ - task-poky-base-utils \ - task-poky-base-utils-dbg \ - task-poky-base-utils-dev \ - task-poky-basic-libs \ - task-poky-basic-libs-dbg \ - task-poky-basic-libs-dev \ - task-poky-basic-utils \ - task-poky-basic-utils-dbg \ - task-poky-basic-utils-dev \ - task-poky-basic-extended \ - task-poky-basic-extended-dbg \ - task-poky-basic-extended-dev \ - task-poky-dev-utils \ - task-poky-dev-utils-dbg \ - task-poky-dev-utils-dev \ - task-poky-multiuser \ - task-poky-multiuser-dbg \ - task-poky-multiuser-dev \ - task-poky-initscripts \ - task-poky-initscripts-dbg \ - task-poky-initscripts-dev \ - task-poky-rpm \ - task-poky-rpm-dbg \ - task-poky-rpm-dev \ - task-poky-sys-services \ - task-poky-sys-services-dbg \ - task-poky-sys-services-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-basic = "\ - task-poky-base-utils \ - task-poky-basic-libs \ - task-poky-basic-utils \ - task-poky-basic-extended \ - task-poky-dev-utils \ - task-poky-multiuser \ - task-poky-initscripts \ - task-poky-rpm \ - task-poky-sys-services \ - " - -RDEPENDS_task-poky-base-utils = "\ - busybox \ - " - -RDEPENDS_task-poky-basic-libs = "\ - glib-2.0 \ - " - -RDEPENDS_task-poky-basic-utils = "\ - bash \ - acl \ - attr \ - bc \ - coreutils \ - cpio \ - e2fsprogs \ - ed \ - file \ - findutils \ - gawk \ - gmp \ - grep \ - makedevs \ - mc \ - mktemp \ - ncurses \ - net-tools \ - pax \ - popt \ - procps \ - psmisc \ - sed \ - tar \ - time \ - udev \ - util-linux \ - zlib \ - " - -RDEPENDS_task-poky-basic-extended = "\ - iproute2 \ - iputils \ - iptables \ - module-init-tools \ - openssl \ - " - -RDEPENDS_task-poky-dev-utils = "\ - byacc \ - diffutils \ - m4 \ - make \ - patch \ - " - -RDEPENDS_task-poky-initscripts = "\ - initscripts \ - sysvinit \ - ethtool \ - mingetty \ - sysklogd \ - " - -RDEPENDS_task-poky-multiuser = "\ - cracklib \ - gzip \ - libuser \ - libpam \ - shadow \ - sudo \ - " - -RDEPENDS_task-poky-rpm = "\ - beecrypt \ - rpm \ - zypper \ - " - -RDEPENDS_task-poky-sys-services = "\ - at \ - bzip2 \ - cronie \ - dbus \ - dbus-glib \ - python-dbus \ - elfutils \ - gzip \ - hal \ - less \ - libcap \ - libevent \ - lighttpd \ - logrotate \ - nfs-utils \ - pciutils \ - libpcre \ - portmap \ - rpcbind \ - sysfsutils \ - tcp-wrappers \ - tzdata \ - " - diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb deleted file mode 100644 index b56c07beb2..0000000000 --- a/meta/recipes-extended/tasks/task-poky-lsb.bb +++ /dev/null @@ -1,198 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation -# - -DESCRIPTION = "Create Small Image Tasks" -PR = "r3" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGES = "\ - task-poky-lsb \ - task-poky-sys-extended \ - task-poky-sys-extended-dbg \ - task-poky-sys-extended-dev \ - task-poky-db \ - task-poky-db-dbg \ - task-poky-db-dev \ - task-poky-misc \ - task-poky-misc-dbg \ - task-poky-misc-dev \ - task-poky-perl \ - task-poky-perl-dbg \ - task-poky-perl-dev \ - task-poky-python \ - task-poky-python-dbg \ - task-poky-python-dev \ - task-poky-tcl \ - task-poky-tcl-dbg \ - task-poky-tcl-dev \ - task-poky-lsb-perl-add \ - task-poky-lsb-python-add \ - task-poky-lsb-graphic-add \ - task-poky-lsb-runtime-add \ - task-poky-lsb-command-add \ - " - - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-lsb = "\ - task-poky-sys-extended \ - task-poky-db \ - task-poky-misc \ - task-poky-perl \ - task-poky-python \ - task-poky-tcl \ - task-poky-lsb-perl-add \ - task-poky-lsb-python-add \ - task-poky-lsb-graphic-add \ - task-poky-lsb-runtime-add \ - task-poky-lsb-command-add \ - " - -RDEPENDS_task-poky-sys-extended = "\ - binutils \ - chkconfig \ - curl \ - dhcp-client \ - diffutils \ - gamin \ - hdparm \ - libaio \ - libxml2 \ - lrzsz \ - lzo \ - mc \ - mdadm \ - minicom \ - neon \ - parted \ - pth \ - quota \ - screen \ - setserial \ - sysstat \ - unzip \ - watchdog \ - which \ - xinetd \ - zip \ - " - -RDEPENDS_task-poky-db = "\ - db \ - sqlite3 \ - " - -RDEPENDS_task-poky-perl = "\ - gdbm \ - perl \ - zlib \ - " - - -RDEPENDS_task-poky-python = "\ - expat \ - gdbm \ - gmp \ - ncurses \ - openssl \ - python \ - readline \ - zip \ - " - -RDEPENDS_task-poky-tcl = "\ - tcl \ - " - -RDEPENDS_task-poky-misc = "\ - elfutils \ - gettext \ - groff \ - lsb \ - lsbsetup \ - lsof \ - man \ - man-pages \ - ncurses \ - strace \ - libusb1 \ - usbutils \ - zlib \ - " - -RDEPENDS_task-poky-lsb-command-add = "\ - localedef \ - fontconfig-utils \ - mailx \ - msmtp \ - chkconfig \ -" -# cups - -RDEPENDS_task-poky-lsb-perl-add = "\ - perl-modules \ - perl-dev \ - perl-misc \ - perl-pod \ -" - -RDEPENDS_task-poky-lsb-python-add = "\ - python-modules \ - python-misc \ -" - -RDEPENDS_task-poky-lsb-graphic-add = "\ - libqtcore4 \ - libqtgui4 \ - libqtsql4 \ - libqtsvg4 \ - libqtxml4 \ - libqtnetwork4 \ - libxt \ - libxxf86vm \ - libdrm \ - libglu \ - libxi \ - libxtst \ - qt4-plugin-sqldriver-sqlite \ - libx11-locale \ - xorg-minimal-fonts \ - gdk-pixbuf-loader-ico \ - gdk-pixbuf-loader-bmp \ - gdk-pixbuf-loader-ani \ -" - -RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\ - libqtopengl4 \ -" -RDEPENDS_task-poky-lsb-graphic-add_atom-pc = "\ - libqtopengl4 \ -" -RDEPENDS_task-poky-lsb-graphic-add_qemuppc = "\ - libqtopengl4 \ -" - -# mesa-dri - -RDEPENDS_task-poky-lsb-runtime-add = "\ - ldd \ - pam-plugin-wheel \ - e2fsprogs-mke2fs \ - mkfontdir \ - liburi-perl \ - libxml-parser-perl \ - libxml-perl \ - eglibc-localedatas \ - eglibc-gconvs \ - eglibc-charmaps \ - eglibc-binaries \ - eglibc-localedata-posix \ - eglibc-extra-nss \ - eglibc-pcprofile \ - eglibc-pic \ - eglibc-utils \ -" diff --git a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb new file mode 100644 index 0000000000..6cb14107d9 --- /dev/null +++ b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb @@ -0,0 +1,21 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r10" + +ALLOW_EMPTY = "1" + +require task-sdk-gmae.inc + +PACKAGES = "${PN}" + +RDEPENDS_${PN} = "\ + task-core-sdk \ + libglade-dev \ + ${SDK-GMAE} \ + ${SDK-EXTRAS}" diff --git a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb new file mode 100644 index 0000000000..32e60a8582 --- /dev/null +++ b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb @@ -0,0 +1,21 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r12" + +ALLOW_EMPTY = "1" + +require task-sdk-gmae.inc + +PACKAGES = "${PN} ${PN}-dbg" + +RDEPENDS_${PN} = "\ + task-core-standalone-sdk-target \ + libglade-dev \ + ${SDK-GMAE} \ + ${SDK-EXTRAS}" diff --git a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb deleted file mode 100644 index b5c2fda159..0000000000 --- a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r10" - -ALLOW_EMPTY = "1" - -require task-sdk-gmae.inc - -PACKAGES = "${PN}" - -RDEPENDS_${PN} = "\ - task-poky-sdk \ - libglade-dev \ - ${SDK-GMAE} \ - ${SDK-EXTRAS}" diff --git a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb deleted file mode 100644 index ad6270adf4..0000000000 --- a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r12" - -ALLOW_EMPTY = "1" - -require task-sdk-gmae.inc - -PACKAGES = "${PN} ${PN}-dbg" - -RDEPENDS_${PN} = "\ - task-poky-standalone-sdk-target \ - libglade-dev \ - ${SDK-GMAE} \ - ${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 210b9492c6..e9dc8a2c65 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 @@ -Install example binary needed for poky-image-clutter +Install example binary needed for core-image-clutter Signed-off-by: Zhai Edwin Index: 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 e91b8272f6..c18ffecefd 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 @@ -Install the test binary needed for poky-image-clutter +Install the test binary needed for core-image-clutter Signed-off-by: Zhai Edwin diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb new file mode 100644 index 0000000000..66839f4f96 --- /dev/null +++ b/meta/recipes-graphics/images/core-image-clutter.bb @@ -0,0 +1,11 @@ +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" + +LICENSE = "MIT" + +IMAGE_INSTALL = "\ + ${POKY_BASE_INSTALL} \ + task-core-clutter-core \ + task-core-clutter-tests \ + task-core-clutter-apps" + +inherit poky-image diff --git a/meta/recipes-graphics/images/poky-image-clutter.bb b/meta/recipes-graphics/images/poky-image-clutter.bb deleted file mode 100644 index a1dcb51b5b..0000000000 --- a/meta/recipes-graphics/images/poky-image-clutter.bb +++ /dev/null @@ -1,11 +0,0 @@ -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" - -LICENSE = "MIT" - -IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ - task-poky-clutter-core \ - task-poky-clutter-tests \ - task-poky-clutter-apps" - -inherit poky-image diff --git a/meta/recipes-graphics/tasks/task-core-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb new file mode 100644 index 0000000000..43c65251a4 --- /dev/null +++ b/meta/recipes-graphics/tasks/task-core-clutter.bb @@ -0,0 +1,36 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Clutter Tasks for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PR = "r4" + +PACKAGES = "\ + task-core-clutter-core \ + task-core-clutter-core-dbg \ + task-core-clutter-core-dev \ + task-core-clutter-apps \ + task-core-clutter-apps-dbg \ + task-core-clutter-apps-dev \ + task-core-clutter-tests \ + task-core-clutter-tests-dbg \ + task-core-clutter-tests-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-clutter-core = "\ + clutter-1.4 \ + clutter-gst-1.4 \ + clutter-gtk-1.4" + +RDEPENDS_task-core-clutter-tests = "\ + clutter-gst-1.4-examples \ + clutter-gtk-1.4-examples" + +#RDEPENDS_task-core-clutter-apps = "\ +# clutter-box2d " diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb deleted file mode 100644 index 555a9ee0f0..0000000000 --- a/meta/recipes-graphics/tasks/task-poky-clutter.bb +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Clutter Tasks for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PR = "r4" - -PACKAGES = "\ - task-poky-clutter-core \ - task-poky-clutter-core-dbg \ - task-poky-clutter-core-dev \ - task-poky-clutter-apps \ - task-poky-clutter-apps-dbg \ - task-poky-clutter-apps-dev \ - task-poky-clutter-tests \ - task-poky-clutter-tests-dbg \ - task-poky-clutter-tests-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-clutter-core = "\ - clutter-1.4 \ - clutter-gst-1.4 \ - clutter-gtk-1.4" - -RDEPENDS_task-poky-clutter-tests = "\ - clutter-gst-1.4-examples \ - clutter-gtk-1.4-examples" - -#RDEPENDS_task-poky-clutter-apps = "\ -# clutter-box2d " diff --git a/meta/recipes-qt/tasks/task-core-qt.bb b/meta/recipes-qt/tasks/task-core-qt.bb new file mode 100644 index 0000000000..69512a4b9f --- /dev/null +++ b/meta/recipes-qt/tasks/task-core-qt.bb @@ -0,0 +1,22 @@ +# +# Copyright (C) 2010 Intel Corporation. All rights reserved +# + +DESCRIPTION = "Qt Tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r3" + +PACKAGES = "\ + task-core-qt-demos \ + task-core-qt-demos-dbg \ + task-core-qt-demos-dev \ + " + +ALLOW_EMPTY = "1" + +QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" +#QTDEMOS_disabled = "fotowall" + +RDEPENDS_task-core-qt-demos = "${QTDEMOS}" diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-poky-qt.bb deleted file mode 100644 index 762dff8e3e..0000000000 --- a/meta/recipes-qt/tasks/task-poky-qt.bb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation. All rights reserved -# - -DESCRIPTION = "Qt Tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r3" - -PACKAGES = "\ - task-poky-qt-demos \ - task-poky-qt-demos-dbg \ - task-poky-qt-demos-dev \ - " - -ALLOW_EMPTY = "1" - -QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" -#QTDEMOS_disabled = "fotowall" - -RDEPENDS_task-poky-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 659df47fa1..7ee575f2eb 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 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} += " \ - task-poky-standalone-sdk-target \ + task-core-standalone-sdk-target \ qt4-embedded-mkspecs \ libqt-embeddedmultimedia4-dev \ libqt-embeddedphonon4-dev \ diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb new file mode 100644 index 0000000000..429095e19e --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-dev.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" + +LICENSE = "MIT" + +inherit poky-image 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 0000000000..1e6aa66832 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-directdisk.bb @@ -0,0 +1,9 @@ +require recipes-core/images/core-image-directdisk.inc + +DESCRIPTION = "Sato Direct Disk Image" + +LICENSE = "MIT" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3" + +do_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 0000000000..9511ca6e74 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Sato Bootable Live Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_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 0000000000..4c1535a44c --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb @@ -0,0 +1,9 @@ +require recipes-core/images/core-image-directdisk.inc + +DESCRIPTION = "Sato SDK Direct Disk Image" + +LICENSE = "MIT" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3" + +do_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 0000000000..f11d895f7e --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Bootable Live Sato SDK Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-sato-sdk:do_rootfs" diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb new file mode 100644 index 0000000000..9f8eef9a52 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb new file mode 100644 index 0000000000..35d1a53c32 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-sato/images/poky-image-sato-dev.bb b/meta/recipes-sato/images/poky-image-sato-dev.bb deleted file mode 100644 index 429095e19e..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-dev.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" - -LICENSE = "MIT" - -inherit poky-image 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 9b6b96eebe..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-directdisk.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-core/images/poky-image-directdisk.inc - -DESCRIPTION = "Sato Direct Disk Image" - -LICENSE = "MIT" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" - -do_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 20f7bf81a0..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Sato Bootable Live Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_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 b69780fa03..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-core/images/poky-image-directdisk.inc - -DESCRIPTION = "Sato SDK Direct Disk Image" - -LICENSE = "MIT" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-sdk-${MACHINE}.ext3" - -do_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 b5e786e983..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-sdk-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Bootable Live Sato SDK Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-sdk-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-sato-sdk:do_rootfs" diff --git a/meta/recipes-sato/images/poky-image-sato-sdk.bb b/meta/recipes-sato/images/poky-image-sato-sdk.bb deleted file mode 100644 index 9f8eef9a52..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-sdk.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-sato/images/poky-image-sato.bb b/meta/recipes-sato/images/poky-image-sato.bb deleted file mode 100644 index 35d1a53c32..0000000000 --- a/meta/recipes-sato/images/poky-image-sato.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb new file mode 100644 index 0000000000..2f9d6a6c10 --- /dev/null +++ b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb @@ -0,0 +1,34 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +DESCRIPTION = "X11 Pimlico Appications List" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r27" + +PACKAGES = "\ + task-core-apps-x11-pimlico \ + task-core-apps-x11-pimlico-dbg \ + task-core-apps-x11-pimlico-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +WEB ?= "" +#WEB = "web-webkit" +# WebKit takes too much space to fit on some devices +# List here for now... +#WEB_c7x0 = "" +#WEB_mx31ads = "" + +RDEPENDS_task-core-apps-x11-pimlico = "\ + eds-dbus \ + contacts \ + dates \ + tasks \ + gaku \ + ${WEB}" diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb new file mode 100644 index 0000000000..43b24d2c9c --- /dev/null +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb @@ -0,0 +1,34 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +DESCRIPTION = "Sato Tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r30" + +PACKAGES = "\ + task-core-x11-sato \ + task-core-x11-sato-dbg \ + task-core-x11-sato-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +NETWORK_MANAGER ?= "connman-gnome" +RDEPENDS_task-core-x11-sato = "\ + matchbox-desktop \ + matchbox-session-sato \ + matchbox-keyboard \ + matchbox-stroke \ + matchbox-config-gtk \ + xcursor-transparent-theme \ + sato-icon-theme \ + settings-daemon \ + gtk-sato-engine \ + gthumb \ + x11vnc \ + ${NETWORK_MANAGER}" diff --git a/meta/recipes-sato/tasks/task-core.bb b/meta/recipes-sato/tasks/task-core.bb new file mode 100644 index 0000000000..a595ad71ae --- /dev/null +++ b/meta/recipes-sato/tasks/task-core.bb @@ -0,0 +1,73 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +DESCRIPTION = "Tasks for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r34" + +PACKAGES = "\ + task-core-apps-console \ + task-core-apps-console-dbg \ + task-core-apps-console-dev \ + task-core-apps-x11-core \ + task-core-apps-x11-core-dbg \ + task-core-apps-x11-core-dev \ + task-core-apps-x11-games \ + task-core-apps-x11-games-dbg \ + task-core-apps-x11-games-dev \ + task-core-x11-base \ + task-core-x11-base-dbg \ + task-core-x11-base-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +XSERVER ?= "xserver-kdrive-fbdev" + +ALLOW_EMPTY = "1" + +SPLASH ?= "psplash" + +# pcmanfm doesn't work on mips/powerpc +FILEMANAGER ?= "pcmanfm" +FILEMANAGER_mips ?= "" + +RDEPENDS_task-core-apps-console = "\ + avahi-daemon \ + dbus \ + portmap \ + ${SPLASH}" + + +RDEPENDS_task-core-x11-base = "\ + dbus \ + pointercal \ + matchbox-wm \ + matchbox-keyboard \ + matchbox-keyboard-applet \ + matchbox-keyboard-im \ + matchbox-panel-2 \ + matchbox-desktop \ + matchbox-session \ + ${XSERVER} \ + x11-common \ + xserver-nodm-init \ + liberation-fonts \ + xauth \ + xhost \ + xset \ + xrandr" + + +RDEPENDS_task-core-apps-x11-core = "\ + leafpad \ + ${FILEMANAGER} \ + matchbox-terminal \ + screenshot" + + +RDEPENDS_task-core-apps-x11-games = "\ + oh-puzzles" diff --git a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb deleted file mode 100644 index 7bb26fc04c..0000000000 --- a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "X11 Pimlico Appications List" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r27" - -PACKAGES = "\ - task-poky-apps-x11-pimlico \ - task-poky-apps-x11-pimlico-dbg \ - task-poky-apps-x11-pimlico-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -WEB ?= "" -#WEB = "web-webkit" -# WebKit takes too much space to fit on some devices -# List here for now... -#WEB_c7x0 = "" -#WEB_mx31ads = "" - -RDEPENDS_task-poky-apps-x11-pimlico = "\ - eds-dbus \ - contacts \ - dates \ - tasks \ - gaku \ - ${WEB}" diff --git a/meta/recipes-sato/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-poky-x11-sato.bb deleted file mode 100644 index c10a32a45d..0000000000 --- a/meta/recipes-sato/tasks/task-poky-x11-sato.bb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "Sato Tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r30" - -PACKAGES = "\ - task-poky-x11-sato \ - task-poky-x11-sato-dbg \ - task-poky-x11-sato-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -NETWORK_MANAGER ?= "connman-gnome" -RDEPENDS_task-poky-x11-sato = "\ - matchbox-desktop \ - matchbox-session-sato \ - matchbox-keyboard \ - matchbox-stroke \ - matchbox-config-gtk \ - xcursor-transparent-theme \ - sato-icon-theme \ - settings-daemon \ - gtk-sato-engine \ - gthumb \ - x11vnc \ - ${NETWORK_MANAGER}" diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-poky.bb deleted file mode 100644 index 4f7bc3d31e..0000000000 --- a/meta/recipes-sato/tasks/task-poky.bb +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "Tasks for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r34" - -PACKAGES = "\ - task-poky-apps-console \ - task-poky-apps-console-dbg \ - task-poky-apps-console-dev \ - task-poky-apps-x11-core \ - task-poky-apps-x11-core-dbg \ - task-poky-apps-x11-core-dev \ - task-poky-apps-x11-games \ - task-poky-apps-x11-games-dbg \ - task-poky-apps-x11-games-dev \ - task-poky-x11-base \ - task-poky-x11-base-dbg \ - task-poky-x11-base-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -XSERVER ?= "xserver-kdrive-fbdev" - -ALLOW_EMPTY = "1" - -SPLASH ?= "psplash" - -# pcmanfm doesn't work on mips/powerpc -FILEMANAGER ?= "pcmanfm" -FILEMANAGER_mips ?= "" - -RDEPENDS_task-poky-apps-console = "\ - avahi-daemon \ - dbus \ - portmap \ - ${SPLASH}" - - -RDEPENDS_task-poky-x11-base = "\ - dbus \ - pointercal \ - matchbox-wm \ - matchbox-keyboard \ - matchbox-keyboard-applet \ - matchbox-keyboard-im \ - matchbox-panel-2 \ - matchbox-desktop \ - matchbox-session \ - ${XSERVER} \ - x11-common \ - xserver-nodm-init \ - liberation-fonts \ - xauth \ - xhost \ - xset \ - xrandr" - - -RDEPENDS_task-poky-apps-x11-core = "\ - leafpad \ - ${FILEMANAGER} \ - matchbox-terminal \ - screenshot" - - -RDEPENDS_task-poky-apps-x11-games = "\ - oh-puzzles" diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image index 1dc48dd54c..657784cba4 100755 --- a/scripts/creat-lsb-image +++ b/scripts/creat-lsb-image @@ -60,14 +60,14 @@ ECHO "Enter directory $IMAGE_PATH" cd $IMAGE_PATH #get architecture -PN=`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 ;}'` +PN=`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 ;}'` if [ "XPN" == "X" ];then - ECHO "${red}Don't find lsb image on platform, Please run \"poky-image-lsb\" to generate lsb image" + ECHO "${red}Don't find lsb image on platform, Please run \"core-image-lsb\" to generate lsb image" exit 1 fi if [ $PN -eq 0 ];then - ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run poky-image-lsb to get lsb image" + ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run core-image-lsb to get lsb image" exit 1 fi #set varible ARCH @@ -125,25 +125,25 @@ else ECHO "Can't find lsb test suite for ${MACHINE_ARCH}" fi cd .. -if [ -L poky-image-lsb-${MACHINE_ARCH}.ext3 ];then - /bin/rm poky-image-lsb-${MACHINE_ARCH}.ext3 +if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then + /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3 exit_check fi #creat lsb image -if [ -f poky-image-lsb-${MACHINE_ARCH}-test.ext3 ];then +if [ -f core-image-lsb-${MACHINE_ARCH}-test.ext3 ];then if [ -d lsbtmp ];then sudo umount lsbtmp fi ECHO "Remove old lsb image..." - /bin/rm poky-image-lsb-${MACHINE_ARCH}-test.ext3 + /bin/rm core-image-lsb-${MACHINE_ARCH}-test.ext3 fi ECHO "creat a big ext3 file for lsb image with 5G..." -dd if=/dev/zero of=poky-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000 +dd if=/dev/zero of=core-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000 exit_check ECHO "Format ext3 image,please input \"y\"" -mkfs.ext3 poky-image-lsb-${MACHINE_ARCH}-test.ext3 -tune2fs -j poky-image-lsb-${MACHINE_ARCH}-test.ext3 +mkfs.ext3 core-image-lsb-${MACHINE_ARCH}-test.ext3 +tune2fs -j core-image-lsb-${MACHINE_ARCH}-test.ext3 ECHO "get a lsb image with lsb test suite" @@ -153,11 +153,11 @@ fi #install file system and lsb test suite to lsb image -sudo mount -o loop poky-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp +sudo mount -o loop core-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp exit_check ECHO " ->Install file system..." -sudo tar jxf poky-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp +sudo tar jxf core-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp exit_check ECHO " ->Install lsb test suite..." @@ -181,18 +181,18 @@ exit_check sudo rm -rf lsbtmp #change file attribute -sudo chown ${USER}:${USER} poky-image-lsb-${MACHINE_ARCH}-test.ext3 +sudo chown ${USER}:${USER} core-image-lsb-${MACHINE_ARCH}-test.ext3 exit_check -sudo chmod 755 poky-image-lsb-${MACHINE_ARCH}-test.ext3 +sudo chmod 755 core-image-lsb-${MACHINE_ARCH}-test.ext3 exit_check #set up link -if [ -L poky-image-lsb-${MACHINE_ARCH}.ext3 ];then +if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then ECHO "Set up link" - /bin/rm poky-image-lsb-${MACHINE_ARCH}.ext3 + /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3 exit_check fi -ln -s poky-image-lsb-${MACHINE_ARCH}-test.ext3 poky-image-lsb-${MACHINE_ARCH}.ext3 +ln -s core-image-lsb-${MACHINE_ARCH}-test.ext3 core-image-lsb-${MACHINE_ARCH}.ext3 ECHO "LSB test environment is set successfully, Please run this image on platform ${MACHINE_ARCH}" diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir index aabf358e13..c900d0e0cb 100755 --- a/scripts/poky-setup-builddir +++ b/scripts/poky-setup-builddir @@ -103,8 +103,8 @@ cat <' Common targets are: - poky-image-minimal - poky-image-sato + core-image-minimal + core-image-sato meta-toolchain meta-toolchain-sdk diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb new file mode 100644 index 0000000000..4fa6068768 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb @@ -0,0 +1,7 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal b/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal new file mode 100644 index 0000000000..0fcc7bba84 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal @@ -0,0 +1 @@ +sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato new file mode 100644 index 0000000000..7a6353e1af --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato @@ -0,0 +1,8 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk new file mode 100644 index 0000000000..42b8e19026 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb deleted file mode 100644 index 4fa6068768..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb +++ /dev/null @@ -1,7 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal deleted file mode 100644 index 0fcc7bba84..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal +++ /dev/null @@ -1 +0,0 @@ -sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato deleted file mode 100644 index 7a6353e1af..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato +++ /dev/null @@ -1,8 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk deleted file mode 100644 index 42b8e19026..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb new file mode 100644 index 0000000000..4fa6068768 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb @@ -0,0 +1,7 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal b/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal new file mode 100644 index 0000000000..0fcc7bba84 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal @@ -0,0 +1 @@ +sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato new file mode 100644 index 0000000000..7a6353e1af --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato @@ -0,0 +1,8 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk new file mode 100644 index 0000000000..42b8e19026 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb deleted file mode 100644 index 4fa6068768..0000000000 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb +++ /dev/null @@ -1,7 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal deleted file mode 100644 index 0fcc7bba84..0000000000 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal +++ /dev/null @@ -1 +0,0 @@ -sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato deleted file mode 100644 index 7a6353e1af..0000000000 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato +++ /dev/null @@ -1,8 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk deleted file mode 100644 index 42b8e19026..0000000000 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb new file mode 100644 index 0000000000..4fa6068768 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb @@ -0,0 +1,7 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal b/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal new file mode 100644 index 0000000000..0fcc7bba84 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal @@ -0,0 +1 @@ +sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato new file mode 100644 index 0000000000..7a6353e1af --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato @@ -0,0 +1,8 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk new file mode 100644 index 0000000000..42b8e19026 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb deleted file mode 100644 index 4fa6068768..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb +++ /dev/null @@ -1,7 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal deleted file mode 100644 index 0fcc7bba84..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal +++ /dev/null @@ -1 +0,0 @@ -sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato deleted file mode 100644 index 7a6353e1af..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato +++ /dev/null @@ -1,8 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk deleted file mode 100644 index 42b8e19026..0000000000 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb new file mode 100644 index 0000000000..4fa6068768 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb @@ -0,0 +1,7 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal new file mode 100644 index 0000000000..0fcc7bba84 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal @@ -0,0 +1 @@ +sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato new file mode 100644 index 0000000000..7a6353e1af --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato @@ -0,0 +1,8 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk new file mode 100644 index 0000000000..42b8e19026 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb deleted file mode 100644 index 4fa6068768..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb +++ /dev/null @@ -1,7 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal deleted file mode 100644 index 0fcc7bba84..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal +++ /dev/null @@ -1 +0,0 @@ -sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato deleted file mode 100644 index 7a6353e1af..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato +++ /dev/null @@ -1,8 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk deleted file mode 100644 index 42b8e19026..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb new file mode 100644 index 0000000000..4fa6068768 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb @@ -0,0 +1,7 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal b/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal new file mode 100644 index 0000000000..0fcc7bba84 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal @@ -0,0 +1 @@ +sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato new file mode 100644 index 0000000000..7a6353e1af --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato @@ -0,0 +1,8 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk new file mode 100644 index 0000000000..42b8e19026 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb deleted file mode 100644 index 4fa6068768..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb +++ /dev/null @@ -1,7 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal deleted file mode 100644 index 0fcc7bba84..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal +++ /dev/null @@ -1 +0,0 @@ -sanity boot diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato deleted file mode 100644 index 7a6353e1af..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato +++ /dev/null @@ -1,8 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk deleted file mode 100644 index 42b8e19026..0000000000 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/runqemu b/scripts/runqemu index d155b561f1..894a296e1c 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -34,7 +34,7 @@ usage() { echo "" echo "Examples:" echo " $MYNAME qemuarm" - echo " $MYNAME qemux86-64 poky-image-sato ext3" + echo " $MYNAME qemux86-64 core-image-sato ext3" echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" echo " $MYNAME qemux86 \"<-m 256>\"" exit 1 @@ -234,31 +234,31 @@ machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'` # Defaults used when these vars need to be inferred QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin QEMUX86_DEFAULT_FSTYPE=ext3 -QEMUX86_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" +QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin QEMUX86_64_DEFAULT_FSTYPE=ext3 -QEMUX86_64_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" +QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin QEMUARM_DEFAULT_FSTYPE=ext3 -QEMUARM_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" +QEMUARM_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin QEMUMIPS_DEFAULT_FSTYPE=ext3 -QEMUMIPS_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" +QEMUMIPS_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin QEMUPPC_DEFAULT_FSTYPE=ext3 -QEMUPPC_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" +QEMUPPC_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal" AKITA_DEFAULT_KERNEL=zImage-akita.bin AKITA_DEFAULT_FSTYPE=jffs2 -AKITA_DEFAULT_ROOTFS="poky-image-sato" +AKITA_DEFAULT_ROOTFS="core-image-sato" SPITZ_DEFAULT_KERNEL=zImage-spitz.bin SPITZ_DEFAULT_FSTYPE=ext3 -SPITZ_DEFAULT_ROOTFS="poky-image-sato" +SPITZ_DEFAULT_ROOTFS="core-image-sato" setup_tmpdir() { if [ -z "$TMPDIR" ]; then @@ -353,7 +353,7 @@ fi # FSTYPE is now set for all cases # Handle cases where a ROOTFS type is given instead of a filename, e.g. -# poky-image-sato +# core-image-sato if [ "$LAZY_ROOTFS" = "true" ]; then setup_tmpdir echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE" diff --git a/scripts/runqemu.README b/scripts/runqemu.README index 12f1191ab7..38f9306381 100644 --- a/scripts/runqemu.README +++ b/scripts/runqemu.README @@ -39,7 +39,7 @@ where: is the path to a kernel (e.g. zimage-qemuarm.bin) is the path to the image (e.g. filesystem-qemuarm.ext2) -It will default to the qemuarm, ext2 and the last kernel and poky-image-sdk +It will default to the qemuarm, ext2 and the last kernel and core-image-sdk image built by poky. -- cgit v1.2.3-54-g00ecf