summaryrefslogtreecommitdiffstats
path: root/meta/classes/core-image.bbclass
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/classes/core-image.bbclass
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/classes/core-image.bbclass')
-rw-r--r--meta/classes/core-image.bbclass4
1 files changed, 0 insertions, 4 deletions
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 ?= ""
62 62
63IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" 63IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
64 64
65X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
66ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
67SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
68
69inherit image 65inherit image
70 66
71# Create /etc/timestamp during image construction to give a reasonably sane default time setting 67# Create /etc/timestamp during image construction to give a reasonably sane default time setting