From 347fc6e82a3d1c1ac7dbabd9e5cdd08abd864bfb Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 9 Jul 2012 13:12:54 -0400 Subject: core-image-*.bb: Remove usage of EXTRA_IMAGE_FEATURES from some .bb files Replace the usage of EXTRA_IMAGE_FEATURES in a small number of .bb files with IMAGE_FEATURES, and leave the use of EXTRA_IMAGE_FEATURES for developers in their local.conf files, to avoid the possibility of undesirable side effects. Signed-off-by: Robert P. J. Day Signed-off-by: Richard Purdie --- meta/recipes-extended/images/core-image-lsb-sdk.bb | 4 ++-- meta/recipes-rt/images/core-image-rt-sdk.bb | 3 +-- meta/recipes-sato/images/core-image-sato-sdk.bb | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb index 047d66b696..7601410828 100644 --- a/meta/recipes-extended/images/core-image-lsb-sdk.bb +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb @@ -2,8 +2,8 @@ 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" -EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" +IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \ + tools-debug tools-profile tools-testapps debug-tweaks" IMAGE_INSTALL = "\ diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb index f994a0434f..d3bf3e9ce2 100644 --- a/meta/recipes-rt/images/core-image-rt-sdk.bb +++ b/meta/recipes-rt/images/core-image-rt-sdk.bb @@ -5,8 +5,7 @@ tools for real-time use. It includes the full meta-toolchain, development \ headers and libraries to form a standalone SDK." DEPENDS = "linux-yocto-rt" -IMAGE_FEATURES += "dev-pkgs tools-sdk" -EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" +IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug tools-profile tools-testapps debug-tweaks" IMAGE_INSTALL += "rt-tests kernel-dev" diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index bc942ad0a5..689315b241 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Image with Sato support that includes everything within \ core-image-sato plus meta-toolchain, development headers and libraries to \ form a standalone SDK." -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" -EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \ + tools-debug tools-profile tools-testapps debug-tweaks" SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh" -- cgit 1.2.3-korg