diff options
author | Beth Flanagan <elizabeth.flanagan@intel.com> | 2012-04-16 13:10:31 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-16 22:30:03 +0100 |
commit | d2fca3db8529b30b80f7528f401467754208ec23 (patch) | |
tree | 72c04928124a11a2ecd450e5120144f04d2c0b0f | |
parent | 15b16060c76bbdcc3dec37cab389aed64d4fdd1d (diff) | |
download | poky-d2fca3db8529b30b80f7528f401467754208ec23.tar.gz |
core-image-rt-*.bb: require munges DESCRIPTION
The require of core-image-minimal overrides the description.
The best fix for this would be conditional setting of DESCRIPTION
in the required images for all image descriptions, but that opens
a potential can of worms. Moving the require fixes this.
(From OE-Core rev: 0bd5f0a86370881b4eb2455df21b0575f6ffd008)
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-rt/images/core-image-rt-sdk.bb | 3 | ||||
-rw-r--r-- | meta/recipes-rt/images/core-image-rt.bb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb index 5a67eebbce..6ec2d005e7 100644 --- a/meta/recipes-rt/images/core-image-rt-sdk.bb +++ b/meta/recipes-rt/images/core-image-rt-sdk.bb | |||
@@ -1,14 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2011 Intel Corporation. | 2 | # Copyright (C) 2011 Intel Corporation. |
3 | # | 3 | # |
4 | require recipes-core/images/core-image-minimal.bb | ||
4 | 5 | ||
5 | DESCRIPTION = "Small image capable of booting a device with a test suite and \ | 6 | DESCRIPTION = "Small image capable of booting a device with a test suite and \ |
6 | tools for real-time use. It includes the full meta-toolchain, development \ | 7 | tools for real-time use. It includes the full meta-toolchain, development \ |
7 | headers and libraries to form a standalone SDK." | 8 | headers and libraries to form a standalone SDK." |
8 | DEPENDS = "linux-yocto-rt" | 9 | DEPENDS = "linux-yocto-rt" |
9 | 10 | ||
10 | require recipes-core/images/core-image-minimal.bb | ||
11 | |||
12 | IMAGE_FEATURES += "dev-pkgs tools-sdk" | 11 | IMAGE_FEATURES += "dev-pkgs tools-sdk" |
13 | EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" | 12 | EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks" |
14 | 13 | ||
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb index ef547a64af..9b816bbfdb 100644 --- a/meta/recipes-rt/images/core-image-rt.bb +++ b/meta/recipes-rt/images/core-image-rt.bb | |||
@@ -1,13 +1,12 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2010 Intel Corporation. | 2 | # Copyright (C) 2010 Intel Corporation. |
3 | # | 3 | # |
4 | require recipes-core/images/core-image-minimal.bb | ||
4 | 5 | ||
5 | DESCRIPTION = "A small image just capable of allowing a device to boot plus a \ | 6 | DESCRIPTION = "A small image just capable of allowing a device to boot plus a \ |
6 | real-time test suite and tools appropriate for real-time use." | 7 | real-time test suite and tools appropriate for real-time use." |
7 | DEPENDS = "linux-yocto-rt" | 8 | DEPENDS = "linux-yocto-rt" |
8 | 9 | ||
9 | require recipes-core/images/core-image-minimal.bb | ||
10 | |||
11 | IMAGE_INSTALL += "rt-tests" | 10 | IMAGE_INSTALL += "rt-tests" |
12 | 11 | ||
13 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |