diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2012-07-09 13:12:54 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-10 14:21:58 +0100 |
commit | cf94f383bda167b32bb234ac77768038f5daf772 (patch) | |
tree | 01ca5696424b2cf30d1ed44bde18273d06025fe0 /meta | |
parent | adad2923d860f49d2291984dd825e3b051c7406a (diff) | |
download | poky-cf94f383bda167b32bb234ac77768038f5daf772.tar.gz |
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.
(From OE-Core rev: 347fc6e82a3d1c1ac7dbabd9e5cdd08abd864bfb)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/images/core-image-lsb-sdk.bb | 4 | ||||
-rw-r--r-- | meta/recipes-rt/images/core-image-rt-sdk.bb | 3 | ||||
-rw-r--r-- | 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 \ | |||
2 | (LSB) implementations. It includes the full meta-toolchain, plus development \ | 2 | (LSB) implementations. It includes the full meta-toolchain, plus development \ |
3 | headers and libraries to form a standalone SDK." | 3 | headers and libraries to form a standalone SDK." |
4 | 4 | ||
5 | IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh" | 5 | IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \ |
6 | EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" | 6 | tools-debug tools-profile tools-testapps debug-tweaks" |
7 | 7 | ||
8 | 8 | ||
9 | IMAGE_INSTALL = "\ | 9 | 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 \ | |||
5 | headers and libraries to form a standalone SDK." | 5 | headers and libraries to form a standalone SDK." |
6 | DEPENDS = "linux-yocto-rt" | 6 | DEPENDS = "linux-yocto-rt" |
7 | 7 | ||
8 | IMAGE_FEATURES += "dev-pkgs tools-sdk" | 8 | IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug tools-profile tools-testapps debug-tweaks" |
9 | EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" | ||
10 | 9 | ||
11 | IMAGE_INSTALL += "rt-tests kernel-dev" | 10 | IMAGE_INSTALL += "rt-tests kernel-dev" |
12 | 11 | ||
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 \ | |||
2 | core-image-sato plus meta-toolchain, development headers and libraries to \ | 2 | core-image-sato plus meta-toolchain, development headers and libraries to \ |
3 | form a standalone SDK." | 3 | form a standalone SDK." |
4 | 4 | ||
5 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs" | 5 | IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \ |
6 | EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" | 6 | tools-debug tools-profile tools-testapps debug-tweaks" |
7 | 7 | ||
8 | SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh" | 8 | SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh" |
9 | 9 | ||