sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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).

(From OE-Core rev: 592d6e602466628d10704835a7b07d3d713f58e1)

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>
This commit is contained in:
Paul Eggleton 2012-08-31 10:45:58 +01:00 committed by Richard Purdie
parent 86d4bb2c3e
commit 2a21c83300
12 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/classes/core-image.bbclass
View File

@ -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 \

4
meta/classes/image.bbclass
View File

@ -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):

2
meta/recipes-core/images/core-image-base.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "A console-only image that fully supports the target device \
hardware."
IMAGE_FEATURES += "apps-console-core"
IMAGE_FEATURES += "splash"
LICENSE = "MIT"

20
meta/recipes-core/packagegroups/packagegroup-core-console.bb
View File

@ -1,20 +0,0 @@
#
# Copyright (C) 2011 Intel Corporation
#
DESCRIPTION = "Tasks for core console applications"
LICENSE = "MIT"
PR = "r35"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
SPLASH ?= "psplash"
RDEPENDS_packagegroup-core-apps-console = "\
avahi-daemon \
dbus \
portmap \
${SPLASH}"

1
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
View File

@ -4,7 +4,6 @@
DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
LICENSE = "MIT"
DEPENDS = "packagegroup-core-console"
PR = "r8"
inherit packagegroup

2
meta/recipes-extended/images/core-image-basic.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "A foundational basic image without support for X that can be \
reasonably used for customization."
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
IMAGE_FEATURES += "splash ssh-server-openssh"
IMAGE_INSTALL = "\
packagegroup-core-boot \

2
meta/recipes-extended/images/core-image-lsb-dev.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for development work. It \
can be used for customization and implementations that conform to Linux \
Standard Base (LSB)."
IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
IMAGE_FEATURES += "splash dev-pkgs ssh-server-openssh"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \

2
meta/recipes-extended/images/core-image-lsb-sdk.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \
(LSB) implementations. It includes the full meta-toolchain, plus development \
headers and libraries to form a standalone SDK."
IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
IMAGE_FEATURES += "splash tools-sdk dev-pkgs ssh-server-openssh \
tools-debug tools-profile tools-testapps debug-tweaks"

2
meta/recipes-extended/images/core-image-lsb.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "A foundational basic image without support for X that can be \
reasonably used for customization and is suitable for implementations that \
conform to Linux Standard Base (LSB)."
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
IMAGE_FEATURES += "splash ssh-server-openssh"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \

2
meta/recipes-graphics/images/core-image-clutter.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
which enables development of rich and animated graphical user interfaces."
IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"

2
meta/recipes-graphics/images/core-image-x11.bb
View File

@ -1,6 +1,6 @@
DESCRIPTION = "A very basic X11 image with a terminal"
IMAGE_FEATURES += "apps-console-core package-management x11-base"
IMAGE_FEATURES += "splash package-management x11-base"
LICENSE = "MIT"

2
meta/recipes-sato/images/core-image-sato.bb
View File

@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
mobile devices. The image supports X11 with a Sato theme, Pimlico \
applications, and contains terminal, editor, and file manager."
IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"