summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 05:56:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:09:00 (GMT)
commitf19bdeab37e8433c42a36383c78b0f10e700342d (patch)
tree898b50f3ba33c1d8b1ccd9826ff1e037d6067ed2
parentb064818003db3d3a3a18a4a27786725b28bd8d56 (diff)
downloadpoky-f19bdeab37e8433c42a36383c78b0f10e700342d.tar.gz
core-image: Add hwcodecs IMAGE_FEATURE
Currently hardware codecs are being injected in rather ugly ways and end up either in no or all images. This adds a dedicated IMAGE_FEATURE for them based on the MACHINE_HWCODECS variable. We may need to refine this in due course but this patch at least illustrates the concept. (From OE-Core rev: 1cb370587fd72e3f0f69678748108cc4116767fb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/core-image.bbclass4
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb2
-rw-r--r--meta/recipes-sato/images/core-image-sato.bb2
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index e0f6dbb..657d5f2 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -23,6 +23,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
23# - ssh-server-dropbear - SSH server (dropbear) 23# - ssh-server-dropbear - SSH server (dropbear)
24# - ssh-server-openssh - SSH server (openssh) 24# - ssh-server-openssh - SSH server (openssh)
25# - qt4-pkgs - Qt4/X11 and demo applications 25# - qt4-pkgs - Qt4/X11 and demo applications
26# - hwcodecs - Install hardware acceleration codecs
26# - package-management - installs package management tools and preserves the package manager database 27# - package-management - installs package management tools and preserves the package manager database
27# - debug-tweaks - makes an image suitable for development, e.g. allowing passwordless root logins 28# - debug-tweaks - makes an image suitable for development, e.g. allowing passwordless root logins
28# - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs 29# - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs
@@ -41,6 +42,7 @@ PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
41PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh" 42PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
42PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" 43PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
43PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps" 44PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps"
45PACKAGE_GROUP_hwcodecs = "${MACHINE_HWCODECS}"
44 46
45 47
46# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' 48# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'
@@ -50,6 +52,8 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
50# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' 52# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2'
51# An error exception would be raised if both image features foo and bar1(or bar2) are included 53# An error exception would be raised if both image features foo and bar1(or bar2) are included
52 54
55MACHINE_HWCODECS ??= ""
56
53python __anonymous() { 57python __anonymous() {
54 # Ensure we still have a splash screen for existing images 58 # Ensure we still have a splash screen for existing images
55 if base_contains("IMAGE_FEATURES", "apps-console-core", "1", "", d) == "1": 59 if base_contains("IMAGE_FEATURES", "apps-console-core", "1", "", d) == "1":
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 2c47dc6..a5f2643 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 += "splash ssh-server-openssh" 5IMAGE_FEATURES += "splash ssh-server-openssh hwcodecs"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index f52a1a5..e3246d2 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 += "splash package-management x11-base x11-sato ssh-server-dropbear" 5IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs"
6 6
7LICENSE = "MIT" 7LICENSE = "MIT"
8 8