From 6488842b0d03cfec9f8675eca5a2e05675decf66 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 31 Aug 2012 10:37:59 +0100 Subject: 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 Signed-off-by: Saul Wold --- meta/classes/core-image.bbclass | 4 ---- meta/recipes-core/images/core-image-core.bb | 2 +- meta/recipes-graphics/images/core-image-clutter.bb | 2 +- meta/recipes-sato/images/core-image-sato-dev.bb | 8 +++----- meta/recipes-sato/images/core-image-sato-sdk.bb | 8 +++----- meta/recipes-sato/images/core-image-sato.bb | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) (limited to 'meta') diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index f4013134d5..d6dd6460eb 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -62,10 +62,6 @@ CORE_IMAGE_EXTRA_INSTALL ?= "" IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" -X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" -ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management" -SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" - inherit image # Create /etc/timestamp during image construction to give a reasonably sane default time setting diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb index ed33e12d46..ea6ba7ecad 100644 --- a/meta/recipes-core/images/core-image-core.bb +++ b/meta/recipes-core/images/core-image-core.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \ and file manager." -IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" +IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core" LICENSE = "MIT" diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index 6c49a02625..aa6e2a2bdd 100644 --- a/meta/recipes-graphics/images/core-image-clutter.bb +++ b/meta/recipes-graphics/images/core-image-clutter.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ which enables development of rich and animated graphical user interfaces." -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" 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" -- cgit 1.2.3-korg