sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Paul Eggleton 2012-08-31 10:37:59 +01:00 committed by Richard Purdie
parent 5f0e3d8c89
commit 153d413b47
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/core-image.bbclass
View File

@ -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

2
meta/recipes-core/images/core-image-core.bb
View File

@ -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"

2
meta/recipes-graphics/images/core-image-clutter.bb
View File

@ -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"

8
meta/recipes-sato/images/core-image-sato-dev.bb
View File

@ -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"

8
meta/recipes-sato/images/core-image-sato-sdk.bb
View File

@ -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"

2
meta/recipes-sato/images/core-image-sato.bb
View File

@ -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"