diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-31 10:45:58 +0100 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2012-09-03 22:52:52 -0700 |
| commit | 592d6e602466628d10704835a7b07d3d713f58e1 (patch) | |
| tree | f79c78d93cc303bd5c24d83215ec130cd89f3509 /meta/classes/core-image.bbclass | |
| parent | dbbcc0cb9d2cbc66027c800075b94eb9b7110a00 (diff) | |
| download | openembedded-core-contrib-592d6e602466628d10704835a7b07d3d713f58e1.tar.gz | |
packagegroup-core-console: remove
This provides one package group, packagegroup-core-apps-console, which
is usually brought in by adding "apps-console-core" to IMAGE_FEATURES.
Aside from the naming inconsistencies, this is a group of mostly
unrelated packages, none of which are actually "apps". Handling each
one:
* dbus: should mostly be brought in by package runtime dependencies
* avahi-daemon: if you are using packagegroup-base (as all images that
inherit from core-image do) this is brought in by having "zeroconf" in
DISTRO_FEATURES.
* portmap: not very useful by itself; should be brought in by selecting
NFS server/client through other means.
* psplash (or whatever SPLASH is set to): this has been changed to be
an explicit item "splash" in IMAGE_FEATURES. Since this is a fairly
fundamental feature, a piece of code has been added to automatically
handle this for images still using apps-console-core (and show a
warning).
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.bbclass | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 6a391d5925..2bfadb4072 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 # # Available IMAGE_FEATURES: # -# - apps-console-core # - x11 - X server # - x11-base - X server with minimal environment # - x11-sato - OpenedHand Sato environment @@ -25,7 +24,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 # - ssh-server-openssh - SSH server (openssh) # - debug-tweaks - makes an image suitable for development # -PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console" PACKAGE_GROUP_x11 = "packagegroup-core-x11" PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato" @@ -47,6 +45,14 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' # An error exception would be raised if both image features foo and bar1(or bar2) are included +python __anonymous() { + # Ensure we still have a splash screen for existing images + if base_contains("IMAGE_FEATURES", "apps-console-core", "1", "", d) == "1": + bb.warn("%s: apps-console-core in IMAGE_FEATURES is no longer supported; adding \"splash\" to enable splash screen" % d.getVar("PN", True)) + d.appendVar("IMAGE_FEATURES", " splash") +} + + CORE_IMAGE_BASE_INSTALL = '\ packagegroup-core-boot \ packagegroup-base-extended \ |