From 1cb370587fd72e3f0f69678748108cc4116767fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 23 Jan 2013 21:56:11 -0800 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/core-image.bbclass | 4 ++++ meta/recipes-extended/images/core-image-lsb.bb | 2 +- meta/recipes-sato/images/core-image-sato.bb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index e0f6dbb7d9..657d5f243a 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 # - ssh-server-dropbear - SSH server (dropbear) # - ssh-server-openssh - SSH server (openssh) # - qt4-pkgs - Qt4/X11 and demo applications +# - hwcodecs - Install hardware acceleration codecs # - package-management - installs package management tools and preserves the package manager database # - debug-tweaks - makes an image suitable for development, e.g. allowing passwordless root logins # - 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" PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh" PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps" +PACKAGE_GROUP_hwcodecs = "${MACHINE_HWCODECS}" # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' @@ -50,6 +52,8 @@ 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 +MACHINE_HWCODECS ??= "" + python __anonymous() { # Ensure we still have a splash screen for existing images 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 2c47dc6b09..a5f2643998 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 \ reasonably used for customization and is suitable for implementations that \ conform to Linux Standard Base (LSB)." -IMAGE_FEATURES += "splash ssh-server-openssh" +IMAGE_FEATURES += "splash ssh-server-openssh hwcodecs" IMAGE_INSTALL = "\ ${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 f52a1a5478..e3246d2b67 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 \ mobile devices. The image supports X11 with a Sato theme, Pimlico \ applications, and contains terminal, editor, and file manager." -IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear" +IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs" LICENSE = "MIT" -- cgit v1.2.3