summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/images
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-31 10:37:59 +0100
committerSaul Wold <sgw@linux.intel.com>2012-09-03 22:52:50 -0700
commit6488842b0d03cfec9f8675eca5a2e05675decf66 (patch)
treeb7c5253517e0bb2ad627bc9c21ba2784d61bb9e0 /meta/recipes-sato/images
parent6c78d99cc2e54a99af22357d7567f64e864949b9 (diff)
downloadopenembedded-core-6488842b0d03cfec9f8675eca5a2e05675decf66.tar.gz
openembedded-core-6488842b0d03cfec9f8675eca5a2e05675decf66.tar.bz2
openembedded-core-6488842b0d03cfec9f8675eca5a2e05675decf66.zip
classes/core-image: remove *_IMAGE_FEATURES variables
This indirection does not add anything in terms of configuration and only serves to increase confusion; and given the nature of these it is unlikely they are being used outside of OE-Core. Change the sato-sdk and sato-dev images to be based on the main Sato image (avoiding the need for a common SATO_IMAGE_FEATURES variable) and eliminate all references to them. Fixes [YOCTO #2458]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato/images')
-rw-r--r--meta/recipes-sato/images/core-image-sato-dev.bb8
-rw-r--r--meta/recipes-sato/images/core-image-sato-sdk.bb8
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
3 files changed, 7 insertions, 11 deletions
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 5ee9a04f36..7fa69d0997 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -1,9 +1,7 @@
+require core-image-sato.bb
+
DESCRIPTION = "Image with Sato for development work. It includes everything \
within core-image-sato plus a native toolchain, application development and \
testing libraries, profiling and debug symbols."
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
-
-LICENSE = "MIT"
-
-inherit core-image
+IMAGE_FEATURES += "dev-pkgs"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 18ed0cd192..1caca402f6 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -1,13 +1,11 @@
+require core-image-sato.bb
+
DESCRIPTION = "Image with Sato support that includes everything within \
core-image-sato plus meta-toolchain, development headers and libraries to \
form a standalone SDK."
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \
+IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
-LICENSE = "MIT"
-
-inherit core-image
-
IMAGE_INSTALL += "kernel-dev"
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index c228a35eb0..4bbf099c43 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
mobile devices. The image supports X11 with a Sato theme, Pimlico \
applications, and contains terminal, editor, and file manager."
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
LICENSE = "MIT"