[oe-commits] Beth Flanagan : core-image-rt-*.bb: require munges DESCRIPTION

git at git.openembedded.org git at git.openembedded.org
Mon Apr 16 21:35:53 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 0bd5f0a86370881b4eb2455df21b0575f6ffd008
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0bd5f0a86370881b4eb2455df21b0575f6ffd008

Author: Beth Flanagan <elizabeth.flanagan at intel.com>
Date:   Mon Apr 16 13:10:31 2012 -0700

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.

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-rt/images/core-image-rt-sdk.bb |    3 +--
 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 5a67eeb..6ec2d00 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 @@
 #
 # Copyright (C) 2011 Intel Corporation.
 #
+require recipes-core/images/core-image-minimal.bb
 
 DESCRIPTION = "Small image capable of booting a device with a test suite and \
 tools for real-time use. It includes the full meta-toolchain, development \
 headers and libraries to form a standalone SDK."
 DEPENDS = "linux-yocto-rt"
 
-require recipes-core/images/core-image-minimal.bb
-
 IMAGE_FEATURES += "dev-pkgs tools-sdk"
 EXTRA_IMAGE_FEATURES += "tools-debug tools-profile tools-testapps debug-tweaks"
 
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb
index ef547a6..9b816bb 100644
--- a/meta/recipes-rt/images/core-image-rt.bb
+++ b/meta/recipes-rt/images/core-image-rt.bb
@@ -1,13 +1,12 @@
 #
 # Copyright (C) 2010 Intel Corporation.
 #
+require recipes-core/images/core-image-minimal.bb
 
 DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
 real-time test suite and tools appropriate for real-time use."
 DEPENDS = "linux-yocto-rt"
 
-require recipes-core/images/core-image-minimal.bb
-
 IMAGE_INSTALL += "rt-tests"
 
 LICENSE = "MIT"





More information about the Openembedded-commits mailing list