summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-08-31 10:45:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:53:00 +0100
commit2a21c8330058752dd96900eaab266d4c75de3b57 (patch)
tree84fd4ad988c9fcc3f5d28cb640f9cd08b91fdb28
parent86d4bb2c3ed24843a3e0bdacc91e49b57943c9fb (diff)
downloadpoky-2a21c8330058752dd96900eaab266d4c75de3b57.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). (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>
-rw-r--r--meta/classes/core-image.bbclass10
-rw-r--r--meta/classes/image.bbclass4
-rw-r--r--meta/recipes-core/images/core-image-base.bb2
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-console.bb20
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-sdk.bb1
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb2
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb2
-rw-r--r--meta/recipes-graphics/images/core-image-x11.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
12 files changed, 20 insertions, 31 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#
28PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
29PACKAGE_GROUP_x11 = "packagegroup-core-x11" 27PACKAGE_GROUP_x11 = "packagegroup-core-x11"
30PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" 28PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
31PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato" 29PACKAGE_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
48python __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
50CORE_IMAGE_BASE_INSTALL = '\ 56CORE_IMAGE_BASE_INSTALL = '\
51 packagegroup-core-boot \ 57 packagegroup-core-boot \
52 packagegroup-base-extended \ 58 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):
39 features = set(oe.data.typed_value('IMAGE_FEATURES', d)) 39 features = set(oe.data.typed_value('IMAGE_FEATURES', d))
40 return features.difference(extras) 40 return features.difference(extras)
41 41
42# Define some very basic feature package groups
43SPLASH ?= "psplash"
44PACKAGE_GROUP_splash = "${SPLASH}"
45
42# Wildcards specifying complementary packages to install for every package that has been explicitly 46# Wildcards specifying complementary packages to install for every package that has been explicitly
43# installed into the rootfs 47# installed into the rootfs
44def complementary_globs(featurevar, d): 48def complementary_globs(featurevar, d):
diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb
index 30c8dd1553..8ef3376bfb 100644
--- a/meta/recipes-core/images/core-image-base.bb
+++ b/meta/recipes-core/images/core-image-base.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "A console-only image that fully supports the target device \ 1DESCRIPTION = "A console-only image that fully supports the target device \
2hardware." 2hardware."
3 3
4IMAGE_FEATURES += "apps-console-core" 4IMAGE_FEATURES += "splash"
5 5
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
deleted file mode 100644
index 0c5e7f1e25..0000000000
--- a/meta/recipes-core/packagegroups/packagegroup-core-console.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1#
2# Copyright (C) 2011 Intel Corporation
3#
4
5DESCRIPTION = "Tasks for core console applications"
6LICENSE = "MIT"
7PR = "r35"
8
9inherit packagegroup
10
11PACKAGE_ARCH = "${MACHINE_ARCH}"
12
13SPLASH ?= "psplash"
14
15RDEPENDS_packagegroup-core-apps-console = "\
16 avahi-daemon \
17 dbus \
18 portmap \
19 ${SPLASH}"
20
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 8d7bbac3a5..e944ec5fe0 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -4,7 +4,6 @@
4 4
5DESCRIPTION = "Software Development Tasks for OpenedHand Poky" 5DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
6LICENSE = "MIT" 6LICENSE = "MIT"
7DEPENDS = "packagegroup-core-console"
8PR = "r8" 7PR = "r8"
9 8
10inherit packagegroup 9inherit packagegroup
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 9aa880ec4f..06f15a8bec 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "A foundational basic image without support for X that can be \ 1DESCRIPTION = "A foundational basic image without support for X that can be \
2reasonably used for customization." 2reasonably used for customization."
3 3
4IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 4IMAGE_FEATURES += "splash ssh-server-openssh"
5 5
6IMAGE_INSTALL = "\ 6IMAGE_INSTALL = "\
7 packagegroup-core-boot \ 7 packagegroup-core-boot \
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 557259b1b6..013efb973d 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for development work. It \
2can be used for customization and implementations that conform to Linux \ 2can be used for customization and implementations that conform to Linux \
3Standard Base (LSB)." 3Standard Base (LSB)."
4 4
5IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" 5IMAGE_FEATURES += "splash dev-pkgs ssh-server-openssh"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index d07f90d527..abddb767c6 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \
2(LSB) implementations. It includes the full meta-toolchain, plus development \ 2(LSB) implementations. It includes the full meta-toolchain, plus development \
3headers and libraries to form a standalone SDK." 3headers and libraries to form a standalone SDK."
4 4
5IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \ 5IMAGE_FEATURES += "splash tools-sdk dev-pkgs ssh-server-openssh \
6 tools-debug tools-profile tools-testapps debug-tweaks" 6 tools-debug tools-profile tools-testapps debug-tweaks"
7 7
8 8
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 8435596da1..2c47dc6b09 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A foundational basic image without support for X that can be \
2reasonably used for customization and is suitable for implementations that \ 2reasonably used for customization and is suitable for implementations that \
3conform to Linux Standard Base (LSB)." 3conform to Linux Standard Base (LSB)."
4 4
5IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 5IMAGE_FEATURES += "splash ssh-server-openssh"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 496246e4f2..b0f25cf1b1 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \ 1DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
2which enables development of rich and animated graphical user interfaces." 2which enables development of rich and animated graphical user interfaces."
3 3
4IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear" 4IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
5 5
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
diff --git a/meta/recipes-graphics/images/core-image-x11.bb b/meta/recipes-graphics/images/core-image-x11.bb
index 73a707d87c..64dc053f37 100644
--- a/meta/recipes-graphics/images/core-image-x11.bb
+++ b/meta/recipes-graphics/images/core-image-x11.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "A very basic X11 image with a terminal" 1DESCRIPTION = "A very basic X11 image with a terminal"
2 2
3IMAGE_FEATURES += "apps-console-core package-management x11-base" 3IMAGE_FEATURES += "splash package-management x11-base"
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6 6
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 6b6c7611bc..f52a1a5478 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
2mobile devices. The image supports X11 with a Sato theme, Pimlico \ 2mobile devices. The image supports X11 with a Sato theme, Pimlico \
3applications, and contains terminal, editor, and file manager." 3applications, and contains terminal, editor, and file manager."
4 4
5IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear" 5IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8