[PATCH 0/2] Image description fixes

[PATCH 0/2] Image description fixes

[Beth Flanagan]

[YOCTO #2227]

This changeset fixes two issues.

core-image-rt* DESCRIPTION: because of the require for core-image-minimal,
DESCRIPTION is reset to the imported value. Moved the require to the beginning.

A better solution may be to set all the image DESCRIPTIONS to ?= but that
may introduce some issues. 

This also fixes a small typo in core-image-sato-sdk.

The following changes since commit 5326847ef821c382aac26b474ab0e35939c463b7:

  Hob: fixed a little view issue about package selection page (2012-04-16 12:56:25 +0100)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib eflanagan/image_desc
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/image_desc

Beth Flanagan (2):
  core-image-rt-*.bb: require munges DESCRIPTION
  core-image-sato-sdk: typo in DESCRIPTION

 meta/recipes-rt/images/core-image-rt-sdk.bb     |    3 +--
 meta/recipes-rt/images/core-image-rt.bb         |    3 +--
 meta/recipes-sato/images/core-image-sato-sdk.bb |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

[PATCH 1/2] core-image-rt-*.bb: require munges DESCRIPTION

[Beth Flanagan]

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@intel.com>
---
 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"
-- 
1.7.1

[PATCH 2/2] core-image-sato-sdk: typo in DESCRIPTION

[Beth Flanagan]

Fix for a minor type in DESCRIPTION

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
---
 meta/recipes-sato/images/core-image-sato-sdk.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 6dfd470..eed1698 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -3,7 +3,7 @@
 #
 DESCRIPTION = "Image with Sato support that includes everything within \
 core-image-sato plus meta-toolchain, development headers and libraries to \
-form a standalone SD."
+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"
-- 
1.7.1

Re: [PATCH 0/2] Image description fixes

[Saul Wold]

On 04/16/2012 01:09 PM, Beth Flanagan wrote:
> [YOCTO #2227]
>
> This changeset fixes two issues.
>
> core-image-rt* DESCRIPTION: because of the require for core-image-minimal,
> DESCRIPTION is reset to the imported value. Moved the require to the beginning.
>
> A better solution may be to set all the image DESCRIPTIONS to ?= but that
> may introduce some issues.
>
> This also fixes a small typo in core-image-sato-sdk.
>
> The following changes since commit 5326847ef821c382aac26b474ab0e35939c463b7:
>
>    Hob: fixed a little view issue about package selection page (2012-04-16 12:56:25 +0100)
>
> are available in the git repository at:
>    git://git.yoctoproject.org/poky-contrib eflanagan/image_desc
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/image_desc
>
> Beth Flanagan (2):
>    core-image-rt-*.bb: require munges DESCRIPTION
>    core-image-sato-sdk: typo in DESCRIPTION
>
>   meta/recipes-rt/images/core-image-rt-sdk.bb     |    3 +--
>   meta/recipes-rt/images/core-image-rt.bb         |    3 +--
>   meta/recipes-sato/images/core-image-sato-sdk.bb |    2 +-
>   3 files changed, 3 insertions(+), 5 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Thanks
	Sau!