diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 17:25:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 18:47:30 +0100 |
| commit | 560b04181d8f51d189b99f01a72f17210dadf7a3 (patch) | |
| tree | 8114c4d01ec6519fd278d733a59036b6a58c7215 /meta | |
| parent | 607a7657715f6fcba467a4e55ba64f41f4e13a15 (diff) | |
| download | openembedded-core-560b04181d8f51d189b99f01a72f17210dadf7a3.tar.gz openembedded-core-560b04181d8f51d189b99f01a72f17210dadf7a3.tar.bz2 openembedded-core-560b04181d8f51d189b99f01a72f17210dadf7a3.zip | |
Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
61 files changed, 478 insertions, 478 deletions
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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" - -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 <dongxiao.xu@intel.com>" - -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" + +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 <dongxiao.xu@intel.com>" + +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 <dongxiao.xu@intel.com>" 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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" 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 <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-task-poky-sdk = "red" -RECIPE_LATEST_VERSION_pn-task-poky-sdk = "1.0" -RECIPE_MAINTAINER_pn-task-poky-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-task-core-sdk = "red" +RECIPE_LATEST_VERSION_pn-task-core-sdk = "1.0" +RECIPE_MAINTAINER_pn-task-core-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" 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 <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-poky-image-minimal = "green" -RECIPE_LATEST_VERSION_pn-poky-image-minimal = "1.0" -RECIPE_MAINTAINER_pn-poky-image-minimal = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-core-image-minimal = "green" +RECIPE_LATEST_VERSION_pn-core-image-minimal = "1.0" +RECIPE_MAINTAINER_pn-core-image-minimal = "Dongxiao Xu <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-poky-image-basic = "green" -RECIPE_LATEST_VERSION_pn-poky-image-basic = "1.0" -RECIPE_MAINTAINER_pn-poky-image-basic = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-core-image-basic = "green" +RECIPE_LATEST_VERSION_pn-core-image-basic = "1.0" +RECIPE_MAINTAINER_pn-core-image-basic = "Dongxiao Xu <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-poky-image-sato = "green" -RECIPE_LATEST_VERSION_pn-poky-image-sato = "1.0" -RECIPE_MAINTAINER_pn-poky-image-sato = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-core-image-sato = "green" +RECIPE_LATEST_VERSION_pn-core-image-sato = "1.0" +RECIPE_MAINTAINER_pn-core-image-sato = "Dongxiao Xu <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-poky-image-lsb = "green" -RECIPE_LATEST_VERSION_pn-poky-image-lsb = "1.0" -RECIPE_MAINTAINER_pn-poky-image-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-core-image-lsb = "green" +RECIPE_LATEST_VERSION_pn-core-image-lsb = "1.0" +RECIPE_MAINTAINER_pn-core-image-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>" 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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-task-poky-basic = "green" -RECIPE_LATEST_VERSION_pn-task-poky-basic = "1.0" -RECIPE_MAINTAINER_pn-task-poky-basic = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-task-core-basic = "green" +RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0" +RECIPE_MAINTAINER_pn-task-core-basic = "Dongxiao Xu <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-task-poky-lsb = "green" -RECIPE_LATEST_VERSION_pn-task-poky-lsb = "1.0" -RECIPE_MAINTAINER_pn-task-poky-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-task-core-lsb = "green" +RECIPE_LATEST_VERSION_pn-task-core-lsb = "1.0" +RECIPE_MAINTAINER_pn-task-core-lsb = "Dongxiao Xu <dongxiao.xu@intel.com>" RECIPE_STATUS_pn-task-sdk-host = "green" RECIPE_LATEST_VERSION_pn-task-sdk-host = "1.0" RECIPE_MAINTAINER_pn-task-sdk-host = "Dongxiao Xu <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-task-poky-qt = "green" -RECIPE_LATEST_VERSION_pn-task-poky-qt = "1.0" -RECIPE_MAINTAINER_pn-task-poky-qt = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-task-core-qt = "green" +RECIPE_LATEST_VERSION_pn-task-core-qt = "1.0" +RECIPE_MAINTAINER_pn-task-core-qt = "Dongxiao Xu <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-poky-image-base = "green" -RECIPE_LATEST_VERSION_pn-poky-image-base = "1.0" -RECIPE_MAINTAINER_pn-poky-image-base = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-core-image-base = "green" +RECIPE_LATEST_VERSION_pn-core-image-base = "1.0" +RECIPE_MAINTAINER_pn-core-image-base = "Dongxiao Xu <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-poky-image-core = "green" -RECIPE_LATEST_VERSION_pn-poky-image-core = "1.0" -RECIPE_MAINTAINER_pn-poky-image-core = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-core-image-core = "green" +RECIPE_LATEST_VERSION_pn-core-image-core = "1.0" +RECIPE_MAINTAINER_pn-core-image-core = "Dongxiao Xu <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <dongxiao.xu@intel.com>" -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 <dongxiao.xu@intel.com>" +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 <edwin.zhai@intel.com>" 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/poky-image-base.bb b/meta/recipes-core/images/core-image-base.bb index 461b805b60..461b805b60 100644 --- a/meta/recipes-core/images/poky-image-base.bb +++ b/meta/recipes-core/images/core-image-base.bb diff --git a/meta/recipes-core/images/poky-image-core.bb b/meta/recipes-core/images/core-image-core.bb index c232ccdc54..c232ccdc54 100644 --- a/meta/recipes-core/images/poky-image-core.bb +++ b/meta/recipes-core/images/core-image-core.bb diff --git a/meta/recipes-core/images/poky-image-directdisk.inc b/meta/recipes-core/images/core-image-directdisk.inc index 64144b9abf..64144b9abf 100644 --- a/meta/recipes-core/images/poky-image-directdisk.inc +++ b/meta/recipes-core/images/core-image-directdisk.inc diff --git a/meta/recipes-core/images/poky-image-live.inc b/meta/recipes-core/images/core-image-live.inc index a1b0e1a3dc..2c9b3fb458 100644 --- a/meta/recipes-core/images/poky-image-live.inc +++ b/meta/recipes-core/images/core-image-live.inc @@ -1,5 +1,5 @@ AUTO_SYSLINUXCFG = "1" -INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" +INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz" APPEND += "root=/dev/ram0 " TIMEOUT = "10" @@ -8,7 +8,7 @@ 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" +do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs" inherit bootimg diff --git a/meta/recipes-core/images/poky-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb index c64b657204..248d29f031 100644 --- a/meta/recipes-core/images/poky-image-minimal-dev.bb +++ b/meta/recipes-core/images/core-image-minimal-dev.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2007 OpenedHand Ltd. # -IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}" +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}" IMAGE_FEATURES += "dev-pkgs" 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/poky-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index a94e71218f..3da4a952f7 100644 --- a/meta/recipes-core/images/poky-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -2,7 +2,7 @@ IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" -export IMAGE_BASENAME = "poky-image-minimal-initramfs" +export IMAGE_BASENAME = "core-image-minimal-initramfs" IMAGE_LINGUAS = "" LICENSE = "MIT" diff --git a/meta/recipes-core/images/core-image-minimal-live.bb b/meta/recipes-core/images/core-image-minimal-live.bb new file mode 100644 index 0000000000..0ce2afb2e8 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-live.bb @@ -0,0 +1,11 @@ +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/poky-image-minimal-mtdutils.bb b/meta/recipes-core/images/core-image-minimal-mtdutils.bb index d786131d98..adabaa400a 100644 --- a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb +++ b/meta/recipes-core/images/core-image-minimal-mtdutils.bb @@ -1,6 +1,6 @@ # # Copyright (C) 2008 OpenedHand Ltd. # -require poky-image-minimal.bb +require core-image-minimal.bb IMAGE_INSTALL += "mtd-utils" diff --git a/meta/recipes-core/images/poky-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 6a641f3b84..3aae04edde 100644 --- a/meta/recipes-core/images/poky-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2007 OpenedHand Ltd. # -IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" IMAGE_LINGUAS = " " 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-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/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-poky-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb index 7166761ce4..5aea77169f 100644 --- a/meta/recipes-core/tasks/task-poky-boot.bb +++ b/meta/recipes-core/tasks/task-core-boot.bb @@ -17,7 +17,7 @@ PR = "r7" MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" -RDEPENDS_task-poky-boot = "\ +RDEPENDS_task-core-boot = "\ base-files \ base-passwd \ busybox \ @@ -31,5 +31,5 @@ RDEPENDS_task-poky-boot = "\ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-poky-boot = "\ +RRECOMMENDS_task-core-boot = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/tasks/task-poky-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb index a18d2e3ab8..d5d8291f76 100644 --- a/meta/recipes-core/tasks/task-poky-nfs.bb +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r0" PACKAGES = "\ - task-poky-nfs-server \ - task-poky-nfs-server-dbg \ - task-poky-nfs-server-dev \ + task-core-nfs-server \ + task-core-nfs-server-dbg \ + task-core-nfs-server-dev \ " ALLOW_EMPTY = "1" -RDEPENDS_task-poky-nfs-server = "\ +RDEPENDS_task-core-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}" +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-poky-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb index b1e52c96ca..a158509b2d 100644 --- a/meta/recipes-core/tasks/task-poky-sdk.bb +++ b/meta/recipes-core/tasks/task-core-sdk.bb @@ -13,11 +13,11 @@ ALLOW_EMPTY = "1" #PACKAGEFUNCS =+ 'generate_sdk_pkgs' PACKAGES = "\ - task-poky-sdk \ - task-poky-sdk-dbg \ - task-poky-sdk-dev" + task-core-sdk \ + task-core-sdk-dbg \ + task-core-sdk-dev" -RDEPENDS_task-poky-sdk = "\ +RDEPENDS_task-core-sdk = "\ autoconf \ automake \ binutils \ @@ -51,7 +51,7 @@ RDEPENDS_task-poky-sdk = "\ # 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') +# newpkg = pkg.replace('task-poky', 'task-core-sdk') # # # for each of the task packages, add a corresponding sdk task # pkgs.append(newpkg) @@ -86,4 +86,4 @@ RDEPENDS_task-poky-sdk = "\ # bb.data.setVar('PACKAGES', ' '.join(pkgs), d) #} # -#PACKAGES_DYNAMIC = "task-poky-sdk-*" +#PACKAGES_DYNAMIC = "task-core-sdk-*" diff --git a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb index 4f2ab4425d..1e7402e11f 100644 --- a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb +++ b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r0" PACKAGES = "\ - task-poky-ssh-dropbear \ - task-poky-ssh-dropbear-dbg \ - task-poky-ssh-dropbear-dev \ + task-core-ssh-dropbear \ + task-core-ssh-dropbear-dbg \ + task-core-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" +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-poky-ssh-openssh.bb b/meta/recipes-core/tasks/task-core-ssh-openssh.bb index 5f828b55b9..794399a2b8 100644 --- a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb +++ b/meta/recipes-core/tasks/task-core-ssh-openssh.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r0" PACKAGES = "\ - task-poky-ssh-openssh \ - task-poky-ssh-openssh-dbg \ - task-poky-ssh-openssh-dev \ + task-core-ssh-openssh \ + task-core-ssh-openssh-dbg \ + task-core-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" +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-poky-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb index 3835ac7d6a..3835ac7d6a 100644 --- a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb +++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb index 29f5d4afa1..958dff12a0 100644 --- a/meta/recipes-core/tasks/task-poky-tools.bb +++ b/meta/recipes-core/tasks/task-core-tools.bb @@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 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 \ + 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}" @@ -30,14 +30,14 @@ KEXECTOOLS_mips ?= "" KEXECTOOLS_mipsel ?= "" KEXECTOOLS_powerpc ?= "" -RDEPENDS_task-poky-tools-debug = "\ +RDEPENDS_task-core-tools-debug = "\ gdb \ gdbserver \ tcf-agent \ rsync \ strace" -RDEPENDS_task-poky-tools-profile = "\ +RDEPENDS_task-core-tools-profile = "\ oprofile \ oprofileui-server \ powertop \ @@ -45,7 +45,7 @@ RDEPENDS_task-poky-tools-profile = "\ lttng-control \ lttng-viewer" -RRECOMMENDS_task-poky-tools-profile = "\ +RRECOMMENDS_task-core-tools-profile = "\ perf \ trace-cmd \ kernel-module-oprofile \ @@ -60,13 +60,13 @@ RRECOMMENDS_task-poky-tools-profile = "\ # 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-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-poky-tools-testapps = "\ +RDEPENDS_task-core-tools-testapps = "\ blktool \ fstests \ tslib-calibrate \ 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/poky-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb index 76d5dc2c7a..86972c3660 100644 --- a/meta/recipes-extended/images/poky-image-basic.bb +++ b/meta/recipes-extended/images/core-image-basic.bb @@ -1,8 +1,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh" IMAGE_INSTALL = "\ - task-poky-boot \ - task-poky-basic \ + task-core-boot \ + task-core-basic \ " # ${POKY_BASE_INSTALL} diff --git a/meta/recipes-extended/images/poky-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb index 578fbd0f06..86baf23de1 100644 --- a/meta/recipes-extended/images/poky-image-lsb-dev.bb +++ b/meta/recipes-extended/images/core-image-lsb-dev.bb @@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" IMAGE_INSTALL = "\ ${POKY_BASE_INSTALL} \ - task-poky-basic \ - task-poky-lsb \ + 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/poky-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb index 967bb023d3..74ad1d2d8c 100644 --- a/meta/recipes-extended/images/poky-image-lsb-sdk.bb +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb @@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkg IMAGE_INSTALL = "\ ${POKY_BASE_INSTALL} \ - task-poky-basic \ - task-poky-lsb \ + task-core-basic \ + task-core-lsb \ " inherit poky-image diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb index 33532eac24..63180f5613 100644 --- a/meta/recipes-extended/images/poky-image-lsb.bb +++ b/meta/recipes-extended/images/core-image-lsb.bb @@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh" IMAGE_INSTALL = "\ ${POKY_BASE_INSTALL} \ - task-poky-basic \ - task-poky-lsb \ + task-core-basic \ + task-core-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/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 <mark.hatle@windriver.com> @@ -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-poky-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb index 68c996dc88..e2a37d1160 100644 --- a/meta/recipes-extended/tasks/task-poky-basic.bb +++ b/meta/recipes-extended/tasks/task-core-basic.bb @@ -9,59 +9,59 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 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 \ + 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-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-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-poky-base-utils = "\ +RDEPENDS_task-core-base-utils = "\ busybox \ " -RDEPENDS_task-poky-basic-libs = "\ +RDEPENDS_task-core-basic-libs = "\ glib-2.0 \ " -RDEPENDS_task-poky-basic-utils = "\ +RDEPENDS_task-core-basic-utils = "\ bash \ acl \ attr \ @@ -92,7 +92,7 @@ RDEPENDS_task-poky-basic-utils = "\ zlib \ " -RDEPENDS_task-poky-basic-extended = "\ +RDEPENDS_task-core-basic-extended = "\ iproute2 \ iputils \ iptables \ @@ -100,7 +100,7 @@ RDEPENDS_task-poky-basic-extended = "\ openssl \ " -RDEPENDS_task-poky-dev-utils = "\ +RDEPENDS_task-core-dev-utils = "\ byacc \ diffutils \ m4 \ @@ -108,7 +108,7 @@ RDEPENDS_task-poky-dev-utils = "\ patch \ " -RDEPENDS_task-poky-initscripts = "\ +RDEPENDS_task-core-initscripts = "\ initscripts \ sysvinit \ ethtool \ @@ -116,7 +116,7 @@ RDEPENDS_task-poky-initscripts = "\ sysklogd \ " -RDEPENDS_task-poky-multiuser = "\ +RDEPENDS_task-core-multiuser = "\ cracklib \ gzip \ libuser \ @@ -125,13 +125,13 @@ RDEPENDS_task-poky-multiuser = "\ sudo \ " -RDEPENDS_task-poky-rpm = "\ +RDEPENDS_task-core-rpm = "\ beecrypt \ rpm \ zypper \ " -RDEPENDS_task-poky-sys-services = "\ +RDEPENDS_task-core-sys-services = "\ at \ bzip2 \ cronie \ diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb index b56c07beb2..ef8acb1359 100644 --- a/meta/recipes-extended/tasks/task-poky-lsb.bb +++ b/meta/recipes-extended/tasks/task-core-lsb.bb @@ -9,50 +9,50 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 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 \ + 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-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-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-poky-sys-extended = "\ +RDEPENDS_task-core-sys-extended = "\ binutils \ chkconfig \ curl \ @@ -81,19 +81,19 @@ RDEPENDS_task-poky-sys-extended = "\ zip \ " -RDEPENDS_task-poky-db = "\ +RDEPENDS_task-core-db = "\ db \ sqlite3 \ " -RDEPENDS_task-poky-perl = "\ +RDEPENDS_task-core-perl = "\ gdbm \ perl \ zlib \ " -RDEPENDS_task-poky-python = "\ +RDEPENDS_task-core-python = "\ expat \ gdbm \ gmp \ @@ -104,11 +104,11 @@ RDEPENDS_task-poky-python = "\ zip \ " -RDEPENDS_task-poky-tcl = "\ +RDEPENDS_task-core-tcl = "\ tcl \ " -RDEPENDS_task-poky-misc = "\ +RDEPENDS_task-core-misc = "\ elfutils \ gettext \ groff \ @@ -124,7 +124,7 @@ RDEPENDS_task-poky-misc = "\ zlib \ " -RDEPENDS_task-poky-lsb-command-add = "\ +RDEPENDS_task-core-lsb-command-add = "\ localedef \ fontconfig-utils \ mailx \ @@ -133,19 +133,19 @@ RDEPENDS_task-poky-lsb-command-add = "\ " # cups -RDEPENDS_task-poky-lsb-perl-add = "\ +RDEPENDS_task-core-lsb-perl-add = "\ perl-modules \ perl-dev \ perl-misc \ perl-pod \ " -RDEPENDS_task-poky-lsb-python-add = "\ +RDEPENDS_task-core-lsb-python-add = "\ python-modules \ python-misc \ " -RDEPENDS_task-poky-lsb-graphic-add = "\ +RDEPENDS_task-core-lsb-graphic-add = "\ libqtcore4 \ libqtgui4 \ libqtsql4 \ @@ -166,19 +166,19 @@ RDEPENDS_task-poky-lsb-graphic-add = "\ gdk-pixbuf-loader-ani \ " -RDEPENDS_task-poky-lsb-graphic-add_qemux86 = "\ +RDEPENDS_task-core-lsb-graphic-add_qemux86 = "\ libqtopengl4 \ " -RDEPENDS_task-poky-lsb-graphic-add_atom-pc = "\ +RDEPENDS_task-core-lsb-graphic-add_atom-pc = "\ libqtopengl4 \ " -RDEPENDS_task-poky-lsb-graphic-add_qemuppc = "\ +RDEPENDS_task-core-lsb-graphic-add_qemuppc = "\ libqtopengl4 \ " # mesa-dri -RDEPENDS_task-poky-lsb-runtime-add = "\ +RDEPENDS_task-core-lsb-runtime-add = "\ ldd \ pam-plugin-wheel \ e2fsprogs-mke2fs \ diff --git a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb index b5c2fda159..6cb14107d9 100644 --- a/meta/recipes-gnome/tasks/task-poky-sdk-gmae.bb +++ b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb @@ -15,7 +15,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN}" RDEPENDS_${PN} = "\ - task-poky-sdk \ + task-core-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-core-standalone-gmae-sdk-target.bb index ad6270adf4..32e60a8582 100644 --- a/meta/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bb +++ b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb @@ -15,7 +15,7 @@ require task-sdk-gmae.inc PACKAGES = "${PN} ${PN}-dbg" RDEPENDS_${PN} = "\ - task-poky-standalone-sdk-target \ + task-core-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 <edwin.zhai@intel.com> 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 <edwin.zhai@intel.com> diff --git a/meta/recipes-graphics/images/poky-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index a1dcb51b5b..66839f4f96 100644 --- a/meta/recipes-graphics/images/poky-image-clutter.bb +++ b/meta/recipes-graphics/images/core-image-clutter.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" IMAGE_INSTALL = "\ ${POKY_BASE_INSTALL} \ - task-poky-clutter-core \ - task-poky-clutter-tests \ - task-poky-clutter-apps" + task-core-clutter-core \ + task-core-clutter-tests \ + task-core-clutter-apps" inherit poky-image diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb index 555a9ee0f0..43c65251a4 100644 --- a/meta/recipes-graphics/tasks/task-poky-clutter.bb +++ b/meta/recipes-graphics/tasks/task-core-clutter.bb @@ -10,27 +10,27 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 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 \ + 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-poky-clutter-core = "\ +RDEPENDS_task-core-clutter-core = "\ clutter-1.4 \ clutter-gst-1.4 \ clutter-gtk-1.4" -RDEPENDS_task-poky-clutter-tests = "\ +RDEPENDS_task-core-clutter-tests = "\ clutter-gst-1.4-examples \ clutter-gtk-1.4-examples" -#RDEPENDS_task-poky-clutter-apps = "\ +#RDEPENDS_task-core-clutter-apps = "\ # clutter-box2d " diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-core-qt.bb index 762dff8e3e..69512a4b9f 100644 --- a/meta/recipes-qt/tasks/task-poky-qt.bb +++ b/meta/recipes-qt/tasks/task-core-qt.bb @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r3" PACKAGES = "\ - task-poky-qt-demos \ - task-poky-qt-demos-dbg \ - task-poky-qt-demos-dev \ + task-core-qt-demos \ + task-core-qt-demos-dbg \ + task-core-qt-demos-dev \ " ALLOW_EMPTY = "1" @@ -19,4 +19,4 @@ ALLOW_EMPTY = "1" QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" #QTDEMOS_disabled = "fotowall" -RDEPENDS_task-poky-qt-demos = "${QTDEMOS}" +RDEPENDS_task-core-qt-demos = "${QTDEMOS}" diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/tasks/task-qte-toolchain-target.bb index 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/poky-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb index 429095e19e..429095e19e 100644 --- a/meta/recipes-sato/images/poky-image-sato-dev.bb +++ b/meta/recipes-sato/images/core-image-sato-dev.bb diff --git a/meta/recipes-sato/images/core-image-sato-directdisk.bb b/meta/recipes-sato/images/core-image-sato-directdisk.bb new file mode 100644 index 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/poky-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index 9f8eef9a52..9f8eef9a52 100644 --- a/meta/recipes-sato/images/poky-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb diff --git a/meta/recipes-sato/images/poky-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index 35d1a53c32..35d1a53c32 100644 --- a/meta/recipes-sato/images/poky-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb diff --git a/meta/recipes-sato/images/poky-image-sato-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-directdisk.bb deleted file mode 100644 index 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/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb index 7bb26fc04c..2f9d6a6c10 100644 --- a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb +++ b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r27" PACKAGES = "\ - task-poky-apps-x11-pimlico \ - task-poky-apps-x11-pimlico-dbg \ - task-poky-apps-x11-pimlico-dev \ + task-core-apps-x11-pimlico \ + task-core-apps-x11-pimlico-dbg \ + task-core-apps-x11-pimlico-dev \ " PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -25,7 +25,7 @@ WEB ?= "" #WEB_c7x0 = "" #WEB_mx31ads = "" -RDEPENDS_task-poky-apps-x11-pimlico = "\ +RDEPENDS_task-core-apps-x11-pimlico = "\ eds-dbus \ contacts \ dates \ diff --git a/meta/recipes-sato/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb index c10a32a45d..43b24d2c9c 100644 --- a/meta/recipes-sato/tasks/task-poky-x11-sato.bb +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PR = "r30" PACKAGES = "\ - task-poky-x11-sato \ - task-poky-x11-sato-dbg \ - task-poky-x11-sato-dev \ + task-core-x11-sato \ + task-core-x11-sato-dbg \ + task-core-x11-sato-dev \ " PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -19,7 +19,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" NETWORK_MANAGER ?= "connman-gnome" -RDEPENDS_task-poky-x11-sato = "\ +RDEPENDS_task-core-x11-sato = "\ matchbox-desktop \ matchbox-session-sato \ matchbox-keyboard \ diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-core.bb index 4f7bc3d31e..a595ad71ae 100644 --- a/meta/recipes-sato/tasks/task-poky.bb +++ b/meta/recipes-sato/tasks/task-core.bb @@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 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 \ + 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}" @@ -35,14 +35,14 @@ SPLASH ?= "psplash" FILEMANAGER ?= "pcmanfm" FILEMANAGER_mips ?= "" -RDEPENDS_task-poky-apps-console = "\ +RDEPENDS_task-core-apps-console = "\ avahi-daemon \ dbus \ portmap \ ${SPLASH}" -RDEPENDS_task-poky-x11-base = "\ +RDEPENDS_task-core-x11-base = "\ dbus \ pointercal \ matchbox-wm \ @@ -62,12 +62,12 @@ RDEPENDS_task-poky-x11-base = "\ xrandr" -RDEPENDS_task-poky-apps-x11-core = "\ +RDEPENDS_task-core-apps-x11-core = "\ leafpad \ ${FILEMANAGER} \ matchbox-terminal \ screenshot" -RDEPENDS_task-poky-apps-x11-games = "\ +RDEPENDS_task-core-apps-x11-games = "\ oh-puzzles" |