From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1T8Wgy-0005Lh-IN for openembedded-core@lists.openembedded.org; Mon, 03 Sep 2012 15:27:52 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 03 Sep 2012 06:15:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,359,1344236400"; d="scan'208";a="188214398" Received: from unknown (HELO helios.localnet) ([10.252.121.155]) by azsmga001.ch.intel.com with ESMTP; 03 Sep 2012 06:15:28 -0700 From: Paul Eggleton To: openembedded-core@lists.openembedded.org Date: Mon, 03 Sep 2012 14:14:37 +0100 Message-ID: <3567012.7tNrQ3EpjS@helios> Organization: Intel Corporation User-Agent: KMail/4.9 (Linux/3.2.0-29-generic-pae; KDE/4.9.0; i686; ; ) In-Reply-To: <1a2dd4def9f665707e0b8e99f52166906f14f1b5.1346668109.git.paul.eggleton@linux.intel.com> References: <1a2dd4def9f665707e0b8e99f52166906f14f1b5.1346668109.git.paul.eggleton@linux.intel.com> MIME-Version: 1.0 Subject: Re: [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 13:27:52 -0000 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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 > --- > 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 -- Paul Eggleton Intel Open Source Technology Centre