summaryrefslogtreecommitdiffstats
path: root/meta/classes/core-image.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-30 12:04:18 +0100
committerSaul Wold <sgw@linux.intel.com>2012-09-03 22:52:51 -0700
commit0cc9ced7d96b960994b0671095bc74becfc55e2c (patch)
treeb86c71f0b80d33fd59a2efbad477068dedb4cbf8 /meta/classes/core-image.bbclass
parent9e3b208cce1a673619d82b672c7b83e6e80215cb (diff)
downloadopenembedded-core-contrib-0cc9ced7d96b960994b0671095bc74becfc55e2c.tar.gz
packagegroup-core-x11*: adjust X11 package groups
Now the Sato pieces have been moved out, rebase packagegroup-core-x11 on packagegroup-x11-mini but using the structure/contents of meta-oe's task-x11 so that it can replace that; rename packagegroup-core-x11-mini to packagegroup-core-x11-base and pull in the xserver/utils packages via packagegroup-core-x11, and move both of these recipes under recipes-graphics. x11-mini is renamed to x11-base as it's what people should build on top of and since x11-mini is newer, the corresponding IMAGE_FEATURES item is less likely to be used in existing user recipes. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/core-image.bbclass')
-rw-r--r--meta/classes/core-image.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index f748552d39..a23d3c8c7e 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# Available IMAGE_FEATURES:
#
# - apps-console-core
-# - x11-mini - minimal environment for X11 server
-# - x11-base - X11 server + minimal desktop
+# - x11 - X server
+# - x11-base - X server with minimal environment
# - x11-sato - OpenedHand Sato environment
# - tools-sdk - SDK
# - tools-debug - debugging tools
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - debug-tweaks - makes an image suitable for development
#
PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
-PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
+PACKAGE_GROUP_x11 = "packagegroup-core-x11"
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"