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
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:52:54 +0100
commit153d413b47cf9a197f37e8e6a9f4a0a8b759d4d9 (patch)
treef1a9b699394cccc369854d43c653cc9a4f6cd66b /meta/recipes-sato/images
parent5f0e3d8c89b70c424c956c19e61187486fc9b980 (diff)
downloadpoky-153d413b47cf9a197f37e8e6a9f4a0a8b759d4d9.tar.gz
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]. (From OE-Core rev: 6488842b0d03cfec9f8675eca5a2e05675decf66) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@
1require core-image-sato.bb
2
1DESCRIPTION = "Image with Sato for development work. It includes everything \ 3DESCRIPTION = "Image with Sato for development work. It includes everything \
2within core-image-sato plus a native toolchain, application development and \ 4within core-image-sato plus a native toolchain, application development and \
3testing libraries, profiling and debug symbols." 5testing libraries, profiling and debug symbols."
4 6
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" 7IMAGE_FEATURES += "dev-pkgs"
6
7LICENSE = "MIT"
8
9inherit core-image
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 @@
1require core-image-sato.bb
2
1DESCRIPTION = "Image with Sato support that includes everything within \ 3DESCRIPTION = "Image with Sato support that includes everything within \
2core-image-sato plus meta-toolchain, development headers and libraries to \ 4core-image-sato plus meta-toolchain, development headers and libraries to \
3form a standalone SDK." 5form a standalone SDK."
4 6
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \ 7IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
6 tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" 8 tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
7 9
8LICENSE = "MIT"
9
10inherit core-image
11
12IMAGE_INSTALL += "kernel-dev" 10IMAGE_INSTALL += "kernel-dev"
13 11
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 \
2mobile devices. The image supports X11 with a Sato theme, Pimlico \ 2mobile devices. The image supports X11 with a Sato theme, Pimlico \
3applications, and contains terminal, editor, and file manager." 3applications, and contains terminal, editor, and file manager."
4 4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" 5IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8