diff options
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 | |||
12 | # | 12 | # |
13 | # Available IMAGE_FEATURES: | 13 | # Available IMAGE_FEATURES: |
14 | # | 14 | # |
15 | # - apps-console-core | ||
16 | # - x11 - X server | 15 | # - x11 - X server |
17 | # - x11-base - X server with minimal environment | 16 | # - x11-base - X server with minimal environment |
18 | # - x11-sato - OpenedHand Sato environment | 17 | # - x11-sato - OpenedHand Sato environment |
@@ -25,7 +24,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 | |||
25 | # - ssh-server-openssh - SSH server (openssh) | 24 | # - ssh-server-openssh - SSH server (openssh) |
26 | # - debug-tweaks - makes an image suitable for development | 25 | # - debug-tweaks - makes an image suitable for development |
27 | # | 26 | # |
28 | PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console" | ||
29 | PACKAGE_GROUP_x11 = "packagegroup-core-x11" | 27 | PACKAGE_GROUP_x11 = "packagegroup-core-x11" |
30 | PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" | 28 | PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" |
31 | PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato" | 29 | PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato" |
@@ -47,6 +45,14 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" | |||
47 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' | 45 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' |
48 | # An error exception would be raised if both image features foo and bar1(or bar2) are included | 46 | # An error exception would be raised if both image features foo and bar1(or bar2) are included |
49 | 47 | ||
48 | python __anonymous() { | ||
49 | # Ensure we still have a splash screen for existing images | ||
50 | if base_contains("IMAGE_FEATURES", "apps-console-core", "1", "", d) == "1": | ||
51 | bb.warn("%s: apps-console-core in IMAGE_FEATURES is no longer supported; adding \"splash\" to enable splash screen" % d.getVar("PN", True)) | ||
52 | d.appendVar("IMAGE_FEATURES", " splash") | ||
53 | } | ||
54 | |||
55 | |||
50 | CORE_IMAGE_BASE_INSTALL = '\ | 56 | CORE_IMAGE_BASE_INSTALL = '\ |
51 | packagegroup-core-boot \ | 57 | packagegroup-core-boot \ |
52 | packagegroup-base-extended \ | 58 | packagegroup-base-extended \ |