diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/core-image.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 4 |
2 files changed, 12 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 \ diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0f6ab381cd..2e95556011 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -39,6 +39,10 @@ def normal_groups(d): features = set(oe.data.typed_value('IMAGE_FEATURES', d)) return features.difference(extras) +# Define some very basic feature package groups +SPLASH ?= "psplash" +PACKAGE_GROUP_splash = "${SPLASH}" + # Wildcards specifying complementary packages to install for every package that has been explicitly # installed into the rootfs def complementary_globs(featurevar, d): |