From 560b04181d8f51d189b99f01a72f17210dadf7a3 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-* Signed-off-by: Richard Purdie --- meta/classes/poky-image.bbclass | 94 ++++---- meta/classes/populate_sdk.bbclass | 2 +- .../conf/distro/include/distro_tracking_fields.inc | 268 ++++++++++----------- meta/conf/distro/poky.conf | 2 +- meta/conf/local.conf.sample | 2 +- 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 ------ 93 files changed, 1326 insertions(+), 1326 deletions(-) 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 (limited to 'meta') 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/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 100d0e354a..37fde0f022 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -113,7 +113,7 @@ LOCALE_UTF8_ONLY = "0" DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" -POKY_EXTRA_RDEPENDS = "task-poky-boot" +POKY_EXTRA_RDEPENDS = "task-core-boot" POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index d040275548..896ce55483 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -57,7 +57,7 @@ PACKAGE_CLASSES ?= "package_ipk" # and less useful for bigger images. Also mklibs library optimization can break the ABI compatibility, so should not be applied to the images which are tobe # extended or upgraded later. #This enabled mklibs library size optimization just for the specified image. -#MKLIBS_OPTIMIZED_IMAGES ?= "poky-image-minimal" +#MKLIBS_OPTIMIZED_IMAGES ?= "core-image-minimal" #This enable mklibs library size optimization will be for all the images. #MKLIBS_OPTIMIZED_IMAGES ?= "all" 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 = "\ - ta