From: Beth Flanagan Date: Mon, 16 Apr 2012 20:10:31 +0000 (-0700) Subject: core-image-rt-*.bb: require munges DESCRIPTION X-Git-Tag: 2015-4~10963 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0bd5f0a86370881b4eb2455df21b0575f6ffd008;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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 @@ # # 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 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 @@ # # 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"