Patchwork [02/28] classes/core-image: remove *_IMAGE_FEATURES variables

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 3, 2012, 10:30 a.m.
Message ID <1a2dd4def9f665707e0b8e99f52166906f14f1b5.1346668109.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/35665/
State New
Headers show

Comments

Paul Eggleton - Sept. 3, 2012, 10:30 a.m.
This indirection does not add anything in terms of configuration and
only serves to increase confusion; and given the nature of these it is
unlikely they are being used outside of OE-Core. Change the sato-sdk and
sato-dev images to be based on the main Sato image (avoiding the need
for a common SATO_IMAGE_FEATURES variable) and eliminate all references
to them.

Fixes [YOCTO #2458].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/core-image.bbclass                    |    4 ----
 meta/recipes-core/images/core-image-core.bb        |    2 +-
 meta/recipes-graphics/images/core-image-clutter.bb |    2 +-
 meta/recipes-sato/images/core-image-sato-dev.bb    |    6 ++----
 meta/recipes-sato/images/core-image-sato-sdk.bb    |    8 +++-----
 meta/recipes-sato/images/core-image-sato.bb        |    2 +-
 6 files changed, 8 insertions(+), 16 deletions(-)
Paul Eggleton - Sept. 3, 2012, 1:14 p.m.
On Monday 03 September 2012 11:30:22 Paul Eggleton wrote:
> This indirection does not add anything in terms of configuration and
> only serves to increase confusion; and given the nature of these it is
> unlikely they are being used outside of OE-Core. Change the sato-sdk and
> sato-dev images to be based on the main Sato image (avoiding the need
> for a common SATO_IMAGE_FEATURES variable) and eliminate all references
> to them.
> 
> Fixes [YOCTO #2458].
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/classes/core-image.bbclass                    |    4 ----
>  meta/recipes-core/images/core-image-core.bb        |    2 +-
>  meta/recipes-graphics/images/core-image-clutter.bb |    2 +-
>  meta/recipes-sato/images/core-image-sato-dev.bb    |    6 ++----
>  meta/recipes-sato/images/core-image-sato-sdk.bb    |    8 +++-----
>  meta/recipes-sato/images/core-image-sato.bb        |    2 +-
>  6 files changed, 8 insertions(+), 16 deletions(-)
> 
> diff --git a/meta/classes/core-image.bbclass
> b/meta/classes/core-image.bbclass index f401313..d6dd646 100644
> --- a/meta/classes/core-image.bbclass
> +++ b/meta/classes/core-image.bbclass
> @@ -62,10 +62,6 @@ CORE_IMAGE_EXTRA_INSTALL ?= ""
> 
>  IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
> 
> -X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
> -ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games
> package-management" -SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES}
> x11-sato ssh-server-dropbear" -
>  inherit image
> 
>  # Create /etc/timestamp during image construction to give a reasonably sane
> default time setting diff --git
> a/meta/recipes-core/images/core-image-core.bb
> b/meta/recipes-core/images/core-image-core.bb index ed33e12..ea6ba7e 100644
> --- a/meta/recipes-core/images/core-image-core.bb
> +++ b/meta/recipes-core/images/core-image-core.bb
> @@ -1,7 +1,7 @@
>  DESCRIPTION = "An X11 image with simple applications such as terminal,
> editor, \ and file manager."
> 
> -IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
> +IMAGE_FEATURES += "apps-console-core package-management x11-base
> apps-x11-core"
> 
>  LICENSE = "MIT"
> 
> diff --git a/meta/recipes-graphics/images/core-image-clutter.bb
> b/meta/recipes-graphics/images/core-image-clutter.bb index 6c49a02..aa6e2a2
> 100644
> --- a/meta/recipes-graphics/images/core-image-clutter.bb
> +++ b/meta/recipes-graphics/images/core-image-clutter.bb
> @@ -1,7 +1,7 @@
>  DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter,
> \ which enables development of rich and animated graphical user
> interfaces."
> 
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
> +IMAGE_FEATURES += "apps-console-core package-management x11-base
> apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
> 
>  LICENSE = "MIT"
> 
> diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb
> b/meta/recipes-sato/images/core-image-sato-dev.bb index 5ee9a04..b3db2e6
> 100644
> --- a/meta/recipes-sato/images/core-image-sato-dev.bb
> +++ b/meta/recipes-sato/images/core-image-sato-dev.bb
> @@ -2,8 +2,6 @@ DESCRIPTION = "Image with Sato for development work. It
> includes everything \ within core-image-sato plus a native toolchain,
> application development and \ testing libraries, profiling and debug
> symbols."
> 
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
> +require core-image-sato.bb
> 
> -LICENSE = "MIT"
> -
> -inherit core-image
> +IMAGE_FEATURES += "dev-pkgs"
> diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb
> b/meta/recipes-sato/images/core-image-sato-sdk.bb index 18ed0cd..c462254
> 100644
> --- a/meta/recipes-sato/images/core-image-sato-sdk.bb
> +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
> @@ -2,12 +2,10 @@ DESCRIPTION = "Image with Sato support that includes
> everything within \ core-image-sato plus meta-toolchain, development
> headers and libraries to \ form a standalone SDK."
> 
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs
> tools-sdk qt4-pkgs \ -	tools-debug tools-profile tools-testapps
> debug-tweaks ssh-server-openssh" -
> -LICENSE = "MIT"
> +require core-image-sato.bb
> 
> -inherit core-image
> +IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
> +	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
> 
>  IMAGE_INSTALL += "kernel-dev"
> 

Hmm, the require line needs to be at the top here; I've pushed a fix to the 
branch for these two recipes.

Cheers,
Paul
Saul Wold - Sept. 4, 2012, 2:33 a.m.
On 09/03/2012 03:30 AM, Paul Eggleton wrote:
> This indirection does not add anything in terms of configuration and
> only serves to increase confusion; and given the nature of these it is
> unlikely they are being used outside of OE-Core. Change the sato-sdk and
> sato-dev images to be based on the main Sato image (avoiding the need
> for a common SATO_IMAGE_FEATURES variable) and eliminate all references
> to them.
>
> Fixes [YOCTO #2458].
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>   meta/classes/core-image.bbclass                    |    4 ----
>   meta/recipes-core/images/core-image-core.bb        |    2 +-
>   meta/recipes-graphics/images/core-image-clutter.bb |    2 +-
>   meta/recipes-sato/images/core-image-sato-dev.bb    |    6 ++----
>   meta/recipes-sato/images/core-image-sato-sdk.bb    |    8 +++-----
>   meta/recipes-sato/images/core-image-sato.bb        |    2 +-
>   6 files changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
> index f401313..d6dd646 100644
> --- a/meta/classes/core-image.bbclass
> +++ b/meta/classes/core-image.bbclass
> @@ -62,10 +62,6 @@ CORE_IMAGE_EXTRA_INSTALL ?= ""
>
>   IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
>
> -X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
> -ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
> -SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
> -
>   inherit image
>
>   # Create /etc/timestamp during image construction to give a reasonably sane default time setting
> diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
> index ed33e12..ea6ba7e 100644
> --- a/meta/recipes-core/images/core-image-core.bb
> +++ b/meta/recipes-core/images/core-image-core.bb
> @@ -1,7 +1,7 @@
>   DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
>   and file manager."
>
> -IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
> +IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
>
>   LICENSE = "MIT"
>
> diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
> index 6c49a02..aa6e2a2 100644
> --- a/meta/recipes-graphics/images/core-image-clutter.bb
> +++ b/meta/recipes-graphics/images/core-image-clutter.bb
> @@ -1,7 +1,7 @@
>   DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
>   which enables development of rich and animated graphical user interfaces."
>
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
> +IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
>
>   LICENSE = "MIT"
>
> diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
> index 5ee9a04..b3db2e6 100644
> --- a/meta/recipes-sato/images/core-image-sato-dev.bb
> +++ b/meta/recipes-sato/images/core-image-sato-dev.bb
> @@ -2,8 +2,6 @@ DESCRIPTION = "Image with Sato for development work. It includes everything \
>   within core-image-sato plus a native toolchain, application development and \
>   testing libraries, profiling and debug symbols."
>
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
> +require core-image-sato.bb
>
> -LICENSE = "MIT"
> -
> -inherit core-image
> +IMAGE_FEATURES += "dev-pkgs"
> diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
> index 18ed0cd..c462254 100644
> --- a/meta/recipes-sato/images/core-image-sato-sdk.bb
> +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
> @@ -2,12 +2,10 @@ DESCRIPTION = "Image with Sato support that includes everything within \
>   core-image-sato plus meta-toolchain, development headers and libraries to \
>   form a standalone SDK."
>
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \
> -	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
> -
> -LICENSE = "MIT"
> +require core-image-sato.bb
>
> -inherit core-image
> +IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
> +	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
>
>   IMAGE_INSTALL += "kernel-dev"
>
> diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
> index c228a35..4bbf099 100644
> --- a/meta/recipes-sato/images/core-image-sato.bb
> +++ b/meta/recipes-sato/images/core-image-sato.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
>   mobile devices. The image supports X11 with a Sato theme, Pimlico \
>   applications, and contains terminal, editor, and file manager."
>
> -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
> +IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
>
Should package-management be here or should it be a DISTRO_FEATURE and 
have the ability to be enabled or disabled more on DISTRO basis?  I know 
that we explicitly disable it on core-image-minimal and have a 
ROOTFS_POSTPRESSES_COMMAND there, but I wonder about setting that up on 
a DISTRO basis?

It's part of the following:

meta/recipes-core/images/build-appliance-image.bb
meta/recipes-graphics/images/core-image-clutter.bb
meta/recipes-graphics/images/core-image-x11.bb
meta/recipes-sato/images/core-image-sato.bb

What about LSB? core-image-base or core-image-basic?


Maybe I missed something in all the rest of these changes?

Sau!





>   LICENSE = "MIT"
>
>
Paul Eggleton - Sept. 4, 2012, 8:30 a.m.
On Monday 03 September 2012 19:33:34 Saul Wold wrote:
> > -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
> > +IMAGE_FEATURES += "apps-console-core package-management x11-base
> > apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
>
> Should package-management be here or should it be a DISTRO_FEATURE and
> have the ability to be enabled or disabled more on DISTRO basis?  I know
> that we explicitly disable it on core-image-minimal and have a
> ROOTFS_POSTPRESSES_COMMAND there, but I wonder about setting that up on
> a DISTRO basis?

DISTRO_FEATURES are usually items that influence changes at compilation time. I 
think it's also reasonable to expect people want to be able to produce images 
that have package management for development/testing/debugging and those that 
don't for production, side-by-side, in which case it has to be in 
IMAGE_FEATURES (especially as changing DISTRO_FEATURES on the fly will result 
in a lot of recompilation).

> It's part of the following:
> 
> meta/recipes-core/images/build-appliance-image.bb
> meta/recipes-graphics/images/core-image-clutter.bb
> meta/recipes-graphics/images/core-image-x11.bb
> meta/recipes-sato/images/core-image-sato.bb
> 
> What about LSB? core-image-base or core-image-basic?

The latter images never had package management enabled; I think core-image-
basic at least could reasonably have package management enabled though since 
it's meant to produce a more fully-featured Linux system (mental note, still 
need to rename some of those images). AIUI, LSB doesn't require full package 
management to be enabled, only that rpm packages are able to be installed; 
installing rpm should satisfy this. We would only want to enable full package 
management in the LSB images if it was in some way helpful to run the LSB 
tests.

I'm not entirely sure how we ended up with package management in the Sato 
images and not with some of the others - perhaps there was at one time a 
package management application within Sato or plans for one?

Cheers,
Paul

Patch

diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index f401313..d6dd646 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -62,10 +62,6 @@  CORE_IMAGE_EXTRA_INSTALL ?= ""
 
 IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
 
-X11_IMAGE_FEATURES  = "x11-base apps-x11-core package-management"
-ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games package-management"
-SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
-
 inherit image
 
 # Create /etc/timestamp during image construction to give a reasonably sane default time setting
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index ed33e12..ea6ba7e 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -1,7 +1,7 @@ 
 DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
 and file manager."
 
-IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
 
 LICENSE = "MIT"
 
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 6c49a02..aa6e2a2 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -1,7 +1,7 @@ 
 DESCRIPTION = "An image with support for the Open GL-based toolkit Clutter, \
 which enables development of rich and animated graphical user interfaces."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"
 
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 5ee9a04..b3db2e6 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -2,8 +2,6 @@  DESCRIPTION = "Image with Sato for development work. It includes everything \
 within core-image-sato plus a native toolchain, application development and \
 testing libraries, profiling and debug symbols."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
+require core-image-sato.bb
 
-LICENSE = "MIT"
-
-inherit core-image
+IMAGE_FEATURES += "dev-pkgs"
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 18ed0cd..c462254 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -2,12 +2,10 @@  DESCRIPTION = "Image with Sato support that includes everything within \
 core-image-sato plus meta-toolchain, development headers and libraries to \
 form a standalone SDK."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs tools-sdk qt4-pkgs \
-	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
-
-LICENSE = "MIT"
+require core-image-sato.bb
 
-inherit core-image
+IMAGE_FEATURES += "dev-pkgs tools-sdk qt4-pkgs \
+	tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
 
 IMAGE_INSTALL += "kernel-dev"
 
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index c228a35..4bbf099 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
 mobile devices. The image supports X11 with a Sato theme, Pimlico \
 applications, and contains terminal, editor, and file manager."
 
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
+IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
 
 LICENSE = "MIT"