* [PATCH 01/28] classes/core-image: remove SSHSERVER_IMAGE_FEATURES
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables Paul Eggleton
` (31 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
This variable was added in the very same commit that added a mechanism
that makes it obsolete: if you have dropbear and you want openssh, you
just add ssh-server-openssh to your IMAGE_FEATURES and it will replace
dropbear via IMAGE_FEATURES_REPLACES_.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 3 +--
meta/recipes-sato/images/core-image-sato-sdk.bb | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 52836d2..f401313 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -64,8 +64,7 @@ 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"
-SSHSERVER_IMAGE_FEATURES ??= "ssh-server-dropbear"
-SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ${SSHSERVER_IMAGE_FEATURES}"
+SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear"
inherit image
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 689315b..18ed0cd 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -3,9 +3,7 @@ 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"
-
-SSHSERVER_IMAGE_FEATURES = "ssh-server-openssh"
+ tools-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
LICENSE = "MIT"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
2012-09-03 10:30 ` [PATCH 01/28] classes/core-image: remove SSHSERVER_IMAGE_FEATURES Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 13:14 ` Paul Eggleton
2012-09-04 2:33 ` Saul Wold
2012-09-03 10:30 ` [PATCH 03/28] classes/core-image: remove erroneous nfs-server comment Paul Eggleton
` (30 subsequent siblings)
32 siblings, 2 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
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"
LICENSE = "MIT"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables
2012-09-03 10:30 ` [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables Paul Eggleton
@ 2012-09-03 13:14 ` Paul Eggleton
2012-09-04 2:33 ` Saul Wold
1 sibling, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 13:14 UTC (permalink / raw)
To: openembedded-core
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
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables
2012-09-03 10:30 ` [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables Paul Eggleton
2012-09-03 13:14 ` Paul Eggleton
@ 2012-09-04 2:33 ` Saul Wold
2012-09-04 8:30 ` Paul Eggleton
1 sibling, 1 reply; 49+ messages in thread
From: Saul Wold @ 2012-09-04 2:33 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
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"
>
>
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables
2012-09-04 2:33 ` Saul Wold
@ 2012-09-04 8:30 ` Paul Eggleton
0 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-04 8:30 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
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
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 03/28] classes/core-image: remove erroneous nfs-server comment
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
2012-09-03 10:30 ` [PATCH 01/28] classes/core-image: remove SSHSERVER_IMAGE_FEATURES Paul Eggleton
2012-09-03 10:30 ` [PATCH 02/28] classes/core-image: remove *_IMAGE_FEATURES variables Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 04/28] Rename task to packagegroup Paul Eggleton
` (29 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
It has never been true that this enables exporting the entire rootfs.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index d6dd646..a37cdfc 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - tools-debug - debugging tools
# - tools-profile - profiling tools
# - tools-testapps - tools usable to make some device tests
-# - nfs-server - NFS server (exports / over NFS to everybody)
+# - nfs-server - NFS server
# - ssh-server-dropbear - SSH server (dropbear)
# - ssh-server-openssh - SSH server (openssh)
# - debug-tweaks - makes an image suitable for development
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 04/28] Rename task to packagegroup
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (2 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 03/28] classes/core-image: remove erroneous nfs-server comment Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 05/28] packagegroup-base: remove some useless items Paul Eggleton
` (28 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/archiver.bbclass | 4 +-
meta/classes/core-image.bbclass | 34 +--
meta/classes/insane.bbclass | 2 +-
meta/classes/package.bbclass | 2 +-
meta/classes/packagegroup.bbclass | 30 +++
meta/classes/populate_sdk_base.bbclass | 4 +-
meta/classes/task.bbclass | 32 +--
meta/conf/bitbake.conf | 4 +-
meta/recipes-bsp/qemu-config/qemu-config.bb | 2 +-
meta/recipes-core/images/build-appliance-image.bb | 2 +-
meta/recipes-core/images/core-image-minimal.bb | 2 +-
meta/recipes-core/meta/meta-toolchain-gmae.bb | 2 +-
.../nativesdk-packagegroup-sdk-host.bb} | 0
.../packagegroup-base.bb} | 230 ++++++++++----------
.../packagegroup-core-boot.bb} | 10 +-
.../packagegroup-core-console.bb} | 8 +-
.../packagegroup-core-nfs.bb} | 10 +-
.../packagegroup-core-sdk.bb} | 18 +-
.../packagegroup-core-ssh-dropbear.bb} | 12 +-
.../packagegroup-core-ssh-openssh.bb} | 12 +-
.../packagegroup-core-standalone-sdk-target.bb} | 0
.../packagegroup-core-tools-debug.bb} | 0
.../packagegroup-core-tools-profile.bb} | 0
.../packagegroup-core-tools-testapps.bb} | 0
.../packagegroup-cross-canadian.bb} | 2 +-
.../packagegroup-self-hosted.bb} | 34 +--
meta/recipes-extended/images/core-image-basic.bb | 4 +-
meta/recipes-extended/images/core-image-lsb-dev.bb | 4 +-
meta/recipes-extended/images/core-image-lsb-sdk.bb | 4 +-
meta/recipes-extended/images/core-image-lsb.bb | 4 +-
.../libzypp/libzypp/config-release.patch | 4 +-
.../packagegroup-core-basic.bb} | 94 ++++----
.../packagegroup-core-lsb.bb} | 94 ++++----
.../packagegroup-core-sdk-gmae.bb} | 4 +-
...ackagegroup-core-standalone-gmae-sdk-target.bb} | 4 +-
.../packagegroup-sdk-gmae.inc} | 0
meta/recipes-graphics/images/core-image-clutter.bb | 6 +-
.../images/core-image-gtk-directfb.bb | 8 +-
.../packagegroup-core-clutter.bb} | 24 +-
.../packagegroup-core-gtk-directfb.bb} | 2 +-
meta/recipes-qt/images/qt4e-demo-image.bb | 6 +-
meta/recipes-qt/meta/meta-toolchain-qte.bb | 4 +-
.../nativesdk-packagegroup-qte-toolchain-host.bb} | 2 +-
.../packagegroup-core-qt.bb} | 8 +-
.../packagegroup-qt4e.bb} | 2 +-
.../packagegroup-qte-toolchain-target.bb} | 2 +-
.../packagegroup-core-x11-mini.bb} | 8 +-
.../packagegroup-core-x11-sato.bb} | 8 +-
.../packagegroup-core-x11.bb} | 24 +-
scripts/contrib/documentation-audit.sh | 2 +-
50 files changed, 392 insertions(+), 386 deletions(-)
create mode 100644 meta/classes/packagegroup.bbclass
rename meta/recipes-core/{tasks/nativesdk-task-sdk-host.bb => packagegroups/nativesdk-packagegroup-sdk-host.bb} (100%)
rename meta/recipes-core/{tasks/task-base.bb => packagegroups/packagegroup-base.bb} (45%)
rename meta/recipes-core/{tasks/task-core-boot.bb => packagegroups/packagegroup-core-boot.bb} (88%)
rename meta/recipes-core/{tasks/task-core-console.bb => packagegroups/packagegroup-core-console.bb} (73%)
rename meta/recipes-core/{tasks/task-core-nfs.bb => packagegroups/packagegroup-core-nfs.bb} (65%)
rename meta/recipes-core/{tasks/task-core-sdk.bb => packagegroups/packagegroup-core-sdk.bb} (85%)
rename meta/recipes-core/{tasks/task-core-ssh-dropbear.bb => packagegroups/packagegroup-core-ssh-dropbear.bb} (49%)
rename meta/recipes-core/{tasks/task-core-ssh-openssh.bb => packagegroups/packagegroup-core-ssh-openssh.bb} (50%)
rename meta/recipes-core/{tasks/task-core-standalone-sdk-target.bb => packagegroups/packagegroup-core-standalone-sdk-target.bb} (100%)
rename meta/recipes-core/{tasks/task-core-tools-debug.bb => packagegroups/packagegroup-core-tools-debug.bb} (100%)
rename meta/recipes-core/{tasks/task-core-tools-profile.bb => packagegroups/packagegroup-core-tools-profile.bb} (100%)
rename meta/recipes-core/{tasks/task-core-tools-testapps.bb => packagegroups/packagegroup-core-tools-testapps.bb} (100%)
rename meta/recipes-core/{tasks/task-cross-canadian.bb => packagegroups/packagegroup-cross-canadian.bb} (90%)
rename meta/recipes-core/{tasks/task-self-hosted.bb => packagegroups/packagegroup-self-hosted.bb} (80%)
rename meta/recipes-extended/{tasks/task-core-basic.bb => packagegroups/packagegroup-core-basic.bb} (43%)
rename meta/recipes-extended/{tasks/task-core-lsb.bb => packagegroups/packagegroup-core-lsb.bb} (57%)
rename meta/recipes-gnome/{tasks/task-core-sdk-gmae.bb => packagegroups/packagegroup-core-sdk-gmae.bb} (87%)
rename meta/recipes-gnome/{tasks/task-core-standalone-gmae-sdk-target.bb => packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb} (85%)
rename meta/recipes-gnome/{tasks/task-sdk-gmae.inc => packagegroups/packagegroup-sdk-gmae.inc} (100%)
rename meta/recipes-graphics/{tasks/task-core-clutter.bb => packagegroups/packagegroup-core-clutter.bb} (49%)
rename meta/recipes-graphics/{tasks/task-core-gtk-directfb.bb => packagegroups/packagegroup-core-gtk-directfb.bb} (96%)
rename meta/recipes-qt/{tasks/nativesdk-task-qte-toolchain-host.bb => packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb} (64%)
rename meta/recipes-qt/{tasks/task-core-qt.bb => packagegroups/packagegroup-core-qt.bb} (72%)
rename meta/recipes-qt/{tasks/task-qt4e.bb => packagegroups/packagegroup-qt4e.bb} (98%)
rename meta/recipes-qt/{tasks/task-qte-toolchain-target.bb => packagegroups/packagegroup-qte-toolchain-target.bb} (95%)
rename meta/recipes-sato/{tasks/task-core-x11-mini.bb => packagegroups/packagegroup-core-x11-mini.bb} (85%)
rename meta/recipes-sato/{tasks/task-core-x11-sato.bb => packagegroups/packagegroup-core-x11-sato.bb} (83%)
rename meta/recipes-sato/{tasks/task-core-x11.bb => packagegroups/packagegroup-core-x11.bb} (70%)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 3146d02..160a3aa 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -188,11 +188,11 @@ def get_applying_patches(d):
def not_tarball(d):
"""
- packages including key words 'work-shared', 'native', 'task-' will be passed
+ packages including key words 'work-shared', 'native', 'packagegroup-' will be passed
"""
workdir = d.getVar('WORKDIR', True)
s = d.getVar('S', True)
- if 'work-shared' in s or 'task-' in workdir or 'native' in workdir:
+ if 'work-shared' in s or 'packagegroup-' in workdir or 'native' in workdir:
return True
else:
return False
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index a37cdfc..a85a9ea 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# IMAGE_FEATURES control content of the core reference images
#
-# By default we install task-core-boot and task-base packages - this gives us
+# By default we install packagegroup-core-boot and packagegroup-base packages - this gives us
# working (console only) rootfs.
#
# Available IMAGE_FEATURES:
@@ -27,21 +27,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - ssh-server-openssh - SSH server (openssh)
# - debug-tweaks - makes an image suitable for development
#
-PACKAGE_GROUP_apps-console-core = "task-core-apps-console"
-PACKAGE_GROUP_x11-mini = "task-core-x11-mini"
-PACKAGE_GROUP_x11-base = "task-core-x11-base"
-PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
-PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
-PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
-PACKAGE_GROUP_tools-debug = "task-core-tools-debug"
-PACKAGE_GROUP_tools-profile = "task-core-tools-profile"
-PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps"
-PACKAGE_GROUP_tools-sdk = "task-core-sdk task-core-standalone-sdk-target"
-PACKAGE_GROUP_nfs-server = "task-core-nfs-server"
-PACKAGE_GROUP_ssh-server-dropbear = "task-core-ssh-dropbear"
-PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"
+PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
+PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
+PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
+PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
+PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
+PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
+PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
+PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
+PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"
+PACKAGE_GROUP_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target"
+PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
+PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
+PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
-PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
+PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos"
# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'
@@ -52,8 +52,8 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
# An error exception would be raised if both image features foo and bar1(or bar2) are included
CORE_IMAGE_BASE_INSTALL = '\
- task-core-boot \
- task-base-extended \
+ packagegroup-core-boot \
+ packagegroup-base-extended \
\
${CORE_IMAGE_EXTRA_INSTALL} \
'
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 6de14e0..e74eb3f 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -591,7 +591,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, d):
return True
sane = True
- if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg:
+ if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
# Copied from package_ipk.bbclass
# boiler plate to update the data
localdata = bb.data.createCopy(d)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 78af693..c8aafc9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1763,7 +1763,7 @@ python package_depchains() {
for dep in pkglibdeps[pkg]:
add_dep(pkglibdeplist, dep)
# FIXME this should not look at PN once all task recipes inherit from task.bbclass
- dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('task-'))
+ dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('packagegroup-'))
for suffix in pkgs:
for pkg in pkgs[suffix]:
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
new file mode 100644
index 0000000..6ec154a
--- /dev/null
+++ b/meta/classes/packagegroup.bbclass
@@ -0,0 +1,30 @@
+# Task packages are only used to pull in other packages
+# via their dependencies. They are empty.
+ALLOW_EMPTY = "1"
+
+# By default, only the task package itself is in PACKAGES.
+# -dbg and -dev flavours are handled by the anonfunc below.
+# This means that task recipes used to build multiple task
+# packages have to modify PACKAGES after inheriting task.bbclass.
+PACKAGES = "${PN}"
+
+# By default, task packages do not depend on a certain architecture.
+# Only if dependencies are modified by MACHINE_FEATURES, packages
+# need to be set to MACHINE_ARCH after inheriting task.bbclass
+PACKAGE_ARCH = "all"
+
+# This automatically adds -dbg and -dev flavours of all PACKAGES
+# to the list. Their dependencies (RRECOMMENDS) are handled as usual
+# by package_depchains in a following step.
+python () {
+ packages = d.getVar('PACKAGES', True).split()
+ genpackages = []
+ for pkg in packages:
+ for postfix in ['-dbg', '-dev']:
+ genpackages.append(pkg+postfix)
+ d.setVar('PACKAGES', ' '.join(packages+genpackages))
+}
+
+# We don't want to look at shared library dependencies for the
+# dbg packages
+DEPCHAIN_DBGDEFAULTDEPS = "1"
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index c9fb00d..1c151d7 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -7,9 +7,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}"
-TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
-TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
+TOOLCHAIN_TARGET_TASK ?= "packagegroup-core-standalone-sdk-target packagegroup-core-standalone-sdk-target-dbg"
TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
diff --git a/meta/classes/task.bbclass b/meta/classes/task.bbclass
index 6ec154a..28db500 100644
--- a/meta/classes/task.bbclass
+++ b/meta/classes/task.bbclass
@@ -1,30 +1,6 @@
-# Task packages are only used to pull in other packages
-# via their dependencies. They are empty.
-ALLOW_EMPTY = "1"
-
-# By default, only the task package itself is in PACKAGES.
-# -dbg and -dev flavours are handled by the anonfunc below.
-# This means that task recipes used to build multiple task
-# packages have to modify PACKAGES after inheriting task.bbclass.
-PACKAGES = "${PN}"
-
-# By default, task packages do not depend on a certain architecture.
-# Only if dependencies are modified by MACHINE_FEATURES, packages
-# need to be set to MACHINE_ARCH after inheriting task.bbclass
-PACKAGE_ARCH = "all"
-
-# This automatically adds -dbg and -dev flavours of all PACKAGES
-# to the list. Their dependencies (RRECOMMENDS) are handled as usual
-# by package_depchains in a following step.
-python () {
- packages = d.getVar('PACKAGES', True).split()
- genpackages = []
- for pkg in packages:
- for postfix in ['-dbg', '-dev']:
- genpackages.append(pkg+postfix)
- d.setVar('PACKAGES', ' '.join(packages+genpackages))
+python __anonymous() {
+ bb.warn("%s: task.bbclass is deprecated, please inherit packagegroup instead" % d.getVar("PN", True))
}
-# We don't want to look at shared library dependencies for the
-# dbg packages
-DEPCHAIN_DBGDEFAULTDEPS = "1"
+inherit packagegroup
+
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1d56813..702fc50 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -691,7 +691,7 @@ SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
IMAGE_FSTYPES ?= "tar.gz"
INITRAMFS_FSTYPES ?= "cpio.gz"
PCMCIA_MANAGER ?= "pcmciautils"
-DEFAULT_TASK_PROVIDER ?= "task-base"
+DEFAULT_TASK_PROVIDER ?= "packagegroup-base"
MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
IMAGE_ROOTFS_SIZE ?= "65536"
@@ -705,7 +705,7 @@ CACHE := "${CACHE}"
OES_BITBAKE_CONF = "1"
##################################################################
-# Machine properties and task-base stuff
+# Machine properties and packagegroup-base stuff
##################################################################
DISTRO_FEATURES ?= ""
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 8305f3a..5f7be28 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -37,7 +37,7 @@ pkg_postinst_${PN} () {
sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
}
-RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} task-core-nfs-server oprofileui-server rsync bash"
+RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} packagegroup-core-nfs-server oprofileui-server rsync bash"
inherit update-rc.d allarch
diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index 87eee1a..a86daa5 100644
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>."
-IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
+IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-apps-console packagegroup-core-ssh-openssh packagegroup-self-hosted"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 089a728..0d2613e 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "A small image just capable of allowing a device to boot."
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
+IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_LINGUAS = " "
diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb
index 512810b..5d80574 100644
--- a/meta/recipes-core/meta/meta-toolchain-gmae.bb
+++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb
@@ -1,4 +1,4 @@
-TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg"
+TOOLCHAIN_TARGET_GMAETASK ?= "packagegroup-core-standalone-gmae-sdk-target packagegroup-core-standalone-gmae-sdk-target-dbg"
TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}"
TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}"
PROVIDES = "meta-toolchain-sdk"
diff --git a/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
similarity index 100%
rename from meta/recipes-core/tasks/nativesdk-task-sdk-host.bb
rename to meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
similarity index 45%
rename from meta/recipes-core/tasks/task-base.bb
rename to meta/recipes-core/packagegroups/packagegroup-base.bb
index d5dd140..ea894b2 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -4,46 +4,46 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r75"
-inherit task
+inherit packagegroup
PROVIDES = "${PACKAGES}"
PACKAGES = ' \
- task-base \
- task-base-extended \
- task-distro-base \
- task-machine-base \
+ packagegroup-base \
+ packagegroup-base-extended \
+ packagegroup-distro-base \
+ packagegroup-machine-base \
\
- ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \
\
- ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \
\
- ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \
+ ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \
\
'
@@ -61,46 +61,46 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
#
-# task-base contain stuff needed for base system (machine related)
+# packagegroup-base contain stuff needed for base system (machine related)
#
-RDEPENDS_task-base = "\
- task-distro-base \
- task-machine-base \
+RDEPENDS_packagegroup-base = "\
+ packagegroup-distro-base \
+ packagegroup-machine-base \
\
sysfsutils \
module-init-tools \
- ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
- ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
- ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
- ${@base_contains('MACHINE_FEATURES', 'phone', 'task-base-phone', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \
\
- ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
- ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \
+ ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \
\
- ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'smbfs', 'packagegroup-base-smbfs', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \
+ ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
"
-RRECOMMENDS_task-base = "\
+RRECOMMENDS_packagegroup-base = "\
kernel-module-nls-utf8 \
kernel-module-input \
kernel-module-uinput \
@@ -109,8 +109,8 @@ RRECOMMENDS_task-base = "\
kernel-module-rtc-sysfs \
kernel-module-unix"
-RDEPENDS_task-base-extended = "\
- task-base \
+RDEPENDS_packagegroup-base-extended = "\
+ packagegroup-base \
${ADD_WIFI} \
${ADD_BT} \
${ADD_3G} \
@@ -122,77 +122,77 @@ ADD_3G = ""
python __anonymous () {
# If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
- # then include task-base-wifi in task-base
+ # then include packagegroup-base-wifi in packagegroup-base
distro_features = set(d.getVar("DISTRO_FEATURES", True).split())
machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
- d.setVar("ADD_BT", "task-base-bluetooth")
+ d.setVar("ADD_BT", "packagegroup-base-bluetooth")
if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
- d.setVar("ADD_WIFI", "task-base-wifi")
+ d.setVar("ADD_WIFI", "packagegroup-base-wifi")
if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
- d.setVar("ADD_3G", "task-base-3g")
+ d.setVar("ADD_3G", "packagegroup-base-3g")
}
#
# packages added by distribution
#
-DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}"
-RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
-RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
+DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}"
+RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
+RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
#
# packages added by machine config
#
-RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
-RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
+RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
+RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
-RDEPENDS_task-base-keyboard = "\
+RDEPENDS_packagegroup-base-keyboard = "\
keymaps"
-RDEPENDS_task-base-pci = "\
+RDEPENDS_packagegroup-base-pci = "\
pciutils"
-RDEPENDS_task-base-acpi = "\
+RDEPENDS_packagegroup-base-acpi = "\
acpid \
libacpi "
-RDEPENDS_task-base-apm = "\
+RDEPENDS_packagegroup-base-apm = "\
${VIRTUAL-RUNTIME_apm} \
apmd"
-RDEPENDS_task-base-ext2 = "\
+RDEPENDS_packagegroup-base-ext2 = "\
hdparm \
e2fsprogs \
e2fsprogs-e2fsck \
e2fsprogs-mke2fs"
-RRECOMMENDS_task-base-vfat = "\
+RRECOMMENDS_packagegroup-base-vfat = "\
kernel-module-msdos \
kernel-module-vfat \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437"
-RDEPENDS_task-base-alsa = "\
+RDEPENDS_packagegroup-base-alsa = "\
alsa-utils-alsactl \
alsa-utils-alsamixer \
${VIRTUAL-RUNTIME_alsa-state}"
-RRECOMMENDS_task-base-alsa = "\
+RRECOMMENDS_packagegroup-base-alsa = "\
kernel-module-snd-mixer-oss \
kernel-module-snd-pcm-oss"
-RDEPENDS_task-base-pcmcia = "\
+RDEPENDS_packagegroup-base-pcmcia = "\
pcmciautils \
"
#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
-RRECOMMENDS_task-base-pcmcia = "\
+RRECOMMENDS_packagegroup-base-pcmcia = "\
kernel-module-pcmcia \
kernel-module-airo-cs \
kernel-module-pcnet-cs \
@@ -205,12 +205,12 @@ RRECOMMENDS_task-base-pcmcia = "\
# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
-RDEPENDS_task-base-bluetooth = "\
+RDEPENDS_packagegroup-base-bluetooth = "\
bluez4 \
${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
"
-RRECOMMENDS_task-base-bluetooth = "\
+RRECOMMENDS_packagegroup-base-bluetooth = "\
kernel-module-bluetooth \
kernel-module-l2cap \
kernel-module-rfcomm \
@@ -226,10 +226,10 @@ RRECOMMENDS_task-base-bluetooth = "\
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
"
-RDEPENDS_task-base-irda = "\
+RDEPENDS_packagegroup-base-irda = "\
irda-utils"
-RRECOMMENDS_task-base-irda = "\
+RRECOMMENDS_packagegroup-base-irda = "\
kernel-module-pxaficp-ir \
kernel-module-irda \
kernel-module-ircomm \
@@ -242,17 +242,17 @@ RRECOMMENDS_task-base-irda = "\
kernel-module-sir-dev \
${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
-RRECOMMENDS_task-base-usbgadget = "\
+RRECOMMENDS_packagegroup-base-usbgadget = "\
kernel-module-pxa27x_udc \
kernel-module-gadgetfs \
kernel-module-g-file-storage \
kernel-module-g-serial \
kernel-module-g-ether"
-RDEPENDS_task-base-usbhost = "\
+RDEPENDS_packagegroup-base-usbhost = "\
usbutils "
-RRECOMMENDS_task-base-usbhost = "\
+RRECOMMENDS_packagegroup-base-usbhost = "\
kernel-module-uhci-hcd \
kernel-module-ohci-hcd \
kernel-module-ehci-hcd \
@@ -266,34 +266,34 @@ RRECOMMENDS_task-base-usbhost = "\
kernel-module-usbserial \
kernel-module-usb-storage "
-RDEPENDS_task-base-ppp = "\
+RDEPENDS_packagegroup-base-ppp = "\
ppp \
ppp-dialin"
-RRECOMMENDS_task-base-ppp = "\
+RRECOMMENDS_packagegroup-base-ppp = "\
kernel-module-ppp-async \
kernel-module-ppp-deflate \
kernel-module-ppp-generic \
kernel-module-ppp-mppe \
kernel-module-slhc"
-RDEPENDS_task-base-ipsec = "\
+RDEPENDS_packagegroup-base-ipsec = "\
openswan"
-RRECOMMENDS_task-base-ipsec = "\
+RRECOMMENDS_packagegroup-base-ipsec = "\
kernel-module-ipsec"
#
-# task-base-wifi contain everything needed to get WiFi working
+# packagegroup-base-wifi contain everything needed to get WiFi working
# WEP/WPA connection needs to be supported out-of-box
#
-RDEPENDS_task-base-wifi = "\
+RDEPENDS_packagegroup-base-wifi = "\
wireless-tools \
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
wpa-supplicant"
-RRECOMMENDS_task-base-wifi = "\
+RRECOMMENDS_packagegroup-base-wifi = "\
${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
kernel-module-ieee80211-crypt \
kernel-module-ieee80211-crypt-ccmp \
@@ -307,53 +307,53 @@ RRECOMMENDS_task-base-wifi = "\
kernel-module-aes-generic \
kernel-module-aes"
-RDEPENDS_task-base-3g = "\
+RDEPENDS_packagegroup-base-3g = "\
ofono"
-RRECOMMENDS_task-base-3g = "\
+RRECOMMENDS_packagegroup-base-3g = "\
kernel-module-cdc-acm \
kernel-module-cdc-wdm"
-RRECOMMENDS_task-base-smbfs = "\
+RRECOMMENDS_packagegroup-base-smbfs = "\
kernel-module-cifs \
kernel-module-smbfs"
-RRECOMMENDS_task-base-cramfs = "\
+RRECOMMENDS_packagegroup-base-cramfs = "\
kernel-module-cramfs"
#
-# task-base-nfs provides ONLY client support - server is in nfs-utils package
+# packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package
#
-RDEPENDS_task-base-nfs = "\
+RDEPENDS_packagegroup-base-nfs = "\
portmap"
-RRECOMMENDS_task-base-nfs = "\
+RRECOMMENDS_packagegroup-base-nfs = "\
kernel-module-nfs "
-RDEPENDS_task-base-zeroconf = "\
+RDEPENDS_packagegroup-base-zeroconf = "\
avahi-daemon"
-RDEPENDS_task-base-raid = "\
+RDEPENDS_packagegroup-base-raid = "\
"
-RDEPENDS_task-base-screen = "\
+RDEPENDS_packagegroup-base-screen = "\
"
#
# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
#
-RDEPENDS_task-base-touchscreen = "\
+RDEPENDS_packagegroup-base-touchscreen = "\
"
-RDEPENDS_task-base-ipv6 = "\
+RDEPENDS_packagegroup-base-ipv6 = "\
"
-RRECOMMENDS_task-base-ipv6 = "\
+RRECOMMENDS_packagegroup-base-ipv6 = "\
kernel-module-ipv6 "
-RDEPENDS_task-base-serial = "\
+RDEPENDS_packagegroup-base-serial = "\
setserial \
lrzsz "
-RDEPENDS_task-base-phone = "\
+RDEPENDS_packagegroup-base-phone = "\
ofono"
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
similarity index 88%
rename from meta/recipes-core/tasks/task-core-boot.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 2947509..7e80fff 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -25,12 +25,12 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
PACKAGES = "\
- task-core-boot \
- task-core-boot-dbg \
- task-core-boot-dev \
+ packagegroup-core-boot \
+ packagegroup-core-boot-dbg \
+ packagegroup-core-boot-dev \
"
-RDEPENDS_task-core-boot = "\
+RDEPENDS_packagegroup-core-boot = "\
base-files \
base-passwd \
busybox \
@@ -45,5 +45,5 @@ RDEPENDS_task-core-boot = "\
${VIRTUAL-RUNTIME_update-alternatives} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-RRECOMMENDS_task-core-boot = "\
+RRECOMMENDS_packagegroup-core-boot = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta/recipes-core/tasks/task-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
similarity index 73%
rename from meta/recipes-core/tasks/task-core-console.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-console.bb
index cb22732..fd8eb25 100644
--- a/meta/recipes-core/tasks/task-core-console.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r35"
PACKAGES = "\
- task-core-apps-console \
- task-core-apps-console-dbg \
- task-core-apps-console-dev \
+ packagegroup-core-apps-console \
+ packagegroup-core-apps-console-dbg \
+ packagegroup-core-apps-console-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -20,7 +20,7 @@ ALLOW_EMPTY = "1"
SPLASH ?= "psplash"
-RDEPENDS_task-core-apps-console = "\
+RDEPENDS_packagegroup-core-apps-console = "\
avahi-daemon \
dbus \
portmap \
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
similarity index 65%
rename from meta/recipes-core/tasks/task-core-nfs.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 5c7f455..e63753b 100644
--- a/meta/recipes-core/tasks/task-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -9,14 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r1"
PACKAGES = "\
- task-core-nfs-server \
- task-core-nfs-server-dbg \
- task-core-nfs-server-dev \
+ packagegroup-core-nfs-server \
+ packagegroup-core-nfs-server-dbg \
+ packagegroup-core-nfs-server-dev \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-core-nfs-server = "\
+RDEPENDS_packagegroup-core-nfs-server = "\
nfs-utils \
nfs-utils-client \
"
@@ -24,5 +24,5 @@ RDEPENDS_task-core-nfs-server = "\
# rpcinfo can be useful but only with glibc images
GLIBC_DEPENDENCIES = "glibc-utils"
-RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
+RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
similarity index 85%
rename from meta/recipes-core/tasks/task-core-sdk.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index fe95236..663f705 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -6,18 +6,18 @@ DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS = "task-core-console"
+DEPENDS = "packagegroup-core-console"
PR = "r8"
ALLOW_EMPTY = "1"
#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
PACKAGES = "\
- task-core-sdk \
- task-core-sdk-dbg \
- task-core-sdk-dev"
+ packagegroup-core-sdk \
+ packagegroup-core-sdk-dbg \
+ packagegroup-core-sdk-dev"
-RDEPENDS_task-core-sdk = "\
+RDEPENDS_packagegroup-core-sdk = "\
autoconf \
automake \
binutils \
@@ -48,15 +48,15 @@ RDEPENDS_task-core-sdk = "\
file \
tcl"
-RRECOMMENDS_task-core-sdk = "\
+RRECOMMENDS_packagegroup-core-sdk = "\
libgomp \
libgomp-dev"
#python generate_sdk_pkgs () {
-# poky_pkgs = read_pkgdata('task-core', d)['PACKAGES']
+# poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES']
# pkgs = d.getVar('PACKAGES', True).split()
# for pkg in poky_pkgs.split():
-# newpkg = pkg.replace('task-core', 'task-core-sdk')
+# newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk')
#
# # for each of the task packages, add a corresponding sdk task
# pkgs.append(newpkg)
@@ -91,4 +91,4 @@ RRECOMMENDS_task-core-sdk = "\
# d.setVar('PACKAGES', ' '.join(pkgs))
#}
#
-#PACKAGES_DYNAMIC = "task-core-sdk-*"
+#PACKAGES_DYNAMIC = "packagegroup-core-sdk-*"
diff --git a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
similarity index 49%
rename from meta/recipes-core/tasks/task-core-ssh-dropbear.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 1e7402e..9dcc342 100644
--- a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r0"
PACKAGES = "\
- task-core-ssh-dropbear \
- task-core-ssh-dropbear-dbg \
- task-core-ssh-dropbear-dev \
+ packagegroup-core-ssh-dropbear \
+ packagegroup-core-ssh-dropbear-dbg \
+ packagegroup-core-ssh-dropbear-dev \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-core-ssh-dropbear = "dropbear"
-RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg"
-RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev"
+RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear"
+RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg"
+RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev"
diff --git a/meta/recipes-core/tasks/task-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
similarity index 50%
rename from meta/recipes-core/tasks/task-core-ssh-openssh.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 794399a..7e85b29 100644
--- a/meta/recipes-core/tasks/task-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r0"
PACKAGES = "\
- task-core-ssh-openssh \
- task-core-ssh-openssh-dbg \
- task-core-ssh-openssh-dev \
+ packagegroup-core-ssh-openssh \
+ packagegroup-core-ssh-openssh-dbg \
+ packagegroup-core-ssh-openssh-dev \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-core-ssh-openssh = "openssh"
-RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg"
-RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev"
+RDEPENDS_packagegroup-core-ssh-openssh = "openssh"
+RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg"
+RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev"
diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
similarity index 100%
rename from meta/recipes-core/tasks/task-core-standalone-sdk-target.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
similarity index 100%
rename from meta/recipes-core/tasks/task-core-tools-debug.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
diff --git a/meta/recipes-core/tasks/task-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
similarity index 100%
rename from meta/recipes-core/tasks/task-core-tools-profile.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
similarity index 100%
rename from meta/recipes-core/tasks/task-core-tools-testapps.bb
rename to meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
similarity index 90%
rename from meta/recipes-core/tasks/task-cross-canadian.bb
rename to meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 1840301..6ab4a95 100644
--- a/meta/recipes-core/tasks/task-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Host SDK package for cross canadian toolchain"
-PN = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
PR = "r0"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
similarity index 80%
rename from meta/recipes-core/tasks/task-self-hosted.bb
rename to meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 4d6ab07..118ff7d 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -9,25 +9,25 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PACKAGES = "\
- task-self-hosted \
- task-self-hosted-debug \
- task-self-hosted-sdk \
- task-self-hosted-extended \
- task-self-hosted-graphics \
- task-self-hosted-host-tools \
+ packagegroup-self-hosted \
+ packagegroup-self-hosted-debug \
+ packagegroup-self-hosted-sdk \
+ packagegroup-self-hosted-extended \
+ packagegroup-self-hosted-graphics \
+ packagegroup-self-hosted-host-tools \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-self-hosted = "\
- task-self-hosted-debug \
- task-self-hosted-sdk \
- task-self-hosted-extended \
- task-self-hosted-graphics \
- task-self-hosted-host-tools \
+RDEPENDS_packagegroup-self-hosted = "\
+ packagegroup-self-hosted-debug \
+ packagegroup-self-hosted-sdk \
+ packagegroup-self-hosted-extended \
+ packagegroup-self-hosted-graphics \
+ packagegroup-self-hosted-host-tools \
"
-RDEPENDS_task-self-hosted-host-tools = "\
+RDEPENDS_packagegroup-self-hosted-host-tools = "\
connman \
connman-plugin-ethernet \
dhcp-client \
@@ -52,7 +52,7 @@ RDEPENDS_task-self-hosted-host-tools = "\
"
# eglibc-utils: for rpcgen
-RDEPENDS_task-self-hosted-sdk = "\
+RDEPENDS_packagegroup-self-hosted-sdk = "\
autoconf \
automake \
binutils \
@@ -85,7 +85,7 @@ RDEPENDS_task-self-hosted-sdk = "\
sed \
"
-RDEPENDS_task-self-hosted-debug = " \
+RDEPENDS_packagegroup-self-hosted-debug = " \
gdb \
gdbserver \
rsync \
@@ -93,7 +93,7 @@ RDEPENDS_task-self-hosted-debug = " \
tcf-agent"
-RDEPENDS_task-self-hosted-extended = "\
+RDEPENDS_packagegroup-self-hosted-extended = "\
bzip2 \
chkconfig \
chrpath \
@@ -186,7 +186,7 @@ RDEPENDS_task-self-hosted-extended = "\
"
-RDEPENDS_task-self-hosted-graphics = "\
+RDEPENDS_packagegroup-self-hosted-graphics = "\
builder \
libgl \
libgl-dev \
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index f801346..9aa880e 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -4,8 +4,8 @@ reasonably used for customization."
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
IMAGE_INSTALL = "\
- task-core-boot \
- task-core-basic \
+ packagegroup-core-boot \
+ packagegroup-core-basic \
"
# ${CORE_IMAGE_BASE_INSTALL}
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 3bb7800..557259b 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
- task-core-basic \
- task-core-lsb \
+ packagegroup-core-basic \
+ packagegroup-core-lsb \
"
inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 7601410..d07f90d 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -8,8 +8,8 @@ IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
- task-core-basic \
- task-core-lsb \
+ packagegroup-core-basic \
+ packagegroup-core-lsb \
kernel-dev \
"
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index b370d49..8435596 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
- task-core-basic \
- task-core-lsb \
+ packagegroup-core-basic \
+ packagegroup-core-lsb \
"
inherit core-image
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
index b4e7ab0..26c7307 100644
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch
@@ -5,7 +5,7 @@ Configure distro version package
We need to configure a package that the system can use to determine the
system distribution version.
-Hack: for now set to task-core-rpm.
+Hack: for now set to packagegroup-core-rpm.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
@@ -17,7 +17,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
std::string ZConfig::distroverpkg() const
- { return "redhat-release"; }
-+ { return "task-core-rpm"; }
++ { return "packagegroup-core-rpm"; }
///////////////////////////////////////////////////////////////////
diff --git a/meta/recipes-extended/tasks/task-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
similarity index 43%
rename from meta/recipes-extended/tasks/task-core-basic.bb
rename to meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index a810d37..a7e3eb7 100644
--- a/meta/recipes-extended/tasks/task-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -9,59 +9,59 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PACKAGES = "\
- task-core-basic \
- task-core-base-utils \
- task-core-base-utils-dbg \
- task-core-base-utils-dev \
- task-core-basic-libs \
- task-core-basic-libs-dbg \
- task-core-basic-libs-dev \
- task-core-basic-utils \
- task-core-basic-utils-dbg \
- task-core-basic-utils-dev \
- task-core-basic-extended \
- task-core-basic-extended-dbg \
- task-core-basic-extended-dev \
- task-core-dev-utils \
- task-core-dev-utils-dbg \
- task-core-dev-utils-dev \
- task-core-multiuser \
- task-core-multiuser-dbg \
- task-core-multiuser-dev \
- task-core-initscripts \
- task-core-initscripts-dbg \
- task-core-initscripts-dev \
- task-core-rpm \
- task-core-rpm-dbg \
- task-core-rpm-dev \
- task-core-sys-services \
- task-core-sys-services-dbg \
- task-core-sys-services-dev \
+ packagegroup-core-basic \
+ packagegroup-core-base-utils \
+ packagegroup-core-base-utils-dbg \
+ packagegroup-core-base-utils-dev \
+ packagegroup-core-basic-libs \
+ packagegroup-core-basic-libs-dbg \
+ packagegroup-core-basic-libs-dev \
+ packagegroup-core-basic-utils \
+ packagegroup-core-basic-utils-dbg \
+ packagegroup-core-basic-utils-dev \
+ packagegroup-core-basic-extended \
+ packagegroup-core-basic-extended-dbg \
+ packagegroup-core-basic-extended-dev \
+ packagegroup-core-dev-utils \
+ packagegroup-core-dev-utils-dbg \
+ packagegroup-core-dev-utils-dev \
+ packagegroup-core-multiuser \
+ packagegroup-core-multiuser-dbg \
+ packagegroup-core-multiuser-dev \
+ packagegroup-core-initscripts \
+ packagegroup-core-initscripts-dbg \
+ packagegroup-core-initscripts-dev \
+ packagegroup-core-rpm \
+ packagegroup-core-rpm-dbg \
+ packagegroup-core-rpm-dev \
+ packagegroup-core-sys-services \
+ packagegroup-core-sys-services-dbg \
+ packagegroup-core-sys-services-dev \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-core-basic = "\
- task-core-base-utils \
- task-core-basic-libs \
- task-core-basic-utils \
- task-core-basic-extended \
- task-core-dev-utils \
- task-core-multiuser \
- task-core-initscripts \
- task-core-rpm \
- task-core-sys-services \
+RDEPENDS_packagegroup-core-basic = "\
+ packagegroup-core-base-utils \
+ packagegroup-core-basic-libs \
+ packagegroup-core-basic-utils \
+ packagegroup-core-basic-extended \
+ packagegroup-core-dev-utils \
+ packagegroup-core-multiuser \
+ packagegroup-core-initscripts \
+ packagegroup-core-rpm \
+ packagegroup-core-sys-services \
"
-RDEPENDS_task-core-base-utils = "\
+RDEPENDS_packagegroup-core-base-utils = "\
busybox \
"
-RDEPENDS_task-core-basic-libs = "\
+RDEPENDS_packagegroup-core-basic-libs = "\
glib-2.0 \
"
-RDEPENDS_task-core-basic-utils = "\
+RDEPENDS_packagegroup-core-basic-utils = "\
bash \
acl \
attr \
@@ -92,7 +92,7 @@ RDEPENDS_task-core-basic-utils = "\
zlib \
"
-RDEPENDS_task-core-basic-extended = "\
+RDEPENDS_packagegroup-core-basic-extended = "\
iproute2 \
iputils \
iptables \
@@ -100,7 +100,7 @@ RDEPENDS_task-core-basic-extended = "\
openssl \
"
-RDEPENDS_task-core-dev-utils = "\
+RDEPENDS_packagegroup-core-dev-utils = "\
byacc \
diffutils \
m4 \
@@ -108,7 +108,7 @@ RDEPENDS_task-core-dev-utils = "\
patch \
"
-RDEPENDS_task-core-initscripts = "\
+RDEPENDS_packagegroup-core-initscripts = "\
initscripts \
sysvinit \
ethtool \
@@ -116,7 +116,7 @@ RDEPENDS_task-core-initscripts = "\
sysklogd \
"
-RDEPENDS_task-core-multiuser = "\
+RDEPENDS_packagegroup-core-multiuser = "\
cracklib \
gzip \
libuser \
@@ -125,13 +125,13 @@ RDEPENDS_task-core-multiuser = "\
sudo \
"
-RDEPENDS_task-core-rpm = "\
+RDEPENDS_packagegroup-core-rpm = "\
beecrypt \
rpm \
zypper \
"
-RDEPENDS_task-core-sys-services = "\
+RDEPENDS_packagegroup-core-sys-services = "\
at \
bzip2 \
cronie \
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
similarity index 57%
rename from meta/recipes-extended/tasks/task-core-lsb.bb
rename to meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index be9eac2..984ed36 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -9,50 +9,50 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PACKAGES = "\
- task-core-lsb \
- task-core-sys-extended \
- task-core-sys-extended-dbg \
- task-core-sys-extended-dev \
- task-core-db \
- task-core-db-dbg \
- task-core-db-dev \
- task-core-misc \
- task-core-misc-dbg \
- task-core-misc-dev \
- task-core-perl \
- task-core-perl-dbg \
- task-core-perl-dev \
- task-core-python \
- task-core-python-dbg \
- task-core-python-dev \
- task-core-tcl \
- task-core-tcl-dbg \
- task-core-tcl-dev \
- task-core-lsb-perl-add \
- task-core-lsb-python-add \
- task-core-lsb-graphic-add \
- task-core-lsb-runtime-add \
- task-core-lsb-command-add \
+ packagegroup-core-lsb \
+ packagegroup-core-sys-extended \
+ packagegroup-core-sys-extended-dbg \
+ packagegroup-core-sys-extended-dev \
+ packagegroup-core-db \
+ packagegroup-core-db-dbg \
+ packagegroup-core-db-dev \
+ packagegroup-core-misc \
+ packagegroup-core-misc-dbg \
+ packagegroup-core-misc-dev \
+ packagegroup-core-perl \
+ packagegroup-core-perl-dbg \
+ packagegroup-core-perl-dev \
+ packagegroup-core-python \
+ packagegroup-core-python-dbg \
+ packagegroup-core-python-dev \
+ packagegroup-core-tcl \
+ packagegroup-core-tcl-dbg \
+ packagegroup-core-tcl-dev \
+ packagegroup-core-lsb-perl-add \
+ packagegroup-core-lsb-python-add \
+ packagegroup-core-lsb-graphic-add \
+ packagegroup-core-lsb-runtime-add \
+ packagegroup-core-lsb-command-add \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-core-lsb = "\
- task-core-sys-extended \
- task-core-db \
- task-core-misc \
- task-core-perl \
- task-core-python \
- task-core-tcl \
- task-core-lsb-perl-add \
- task-core-lsb-python-add \
- task-core-lsb-graphic-add \
- task-core-lsb-runtime-add \
- task-core-lsb-command-add \
+RDEPENDS_packagegroup-core-lsb = "\
+ packagegroup-core-sys-extended \
+ packagegroup-core-db \
+ packagegroup-core-misc \
+ packagegroup-core-perl \
+ packagegroup-core-python \
+ packagegroup-core-tcl \
+ packagegroup-core-lsb-perl-add \
+ packagegroup-core-lsb-python-add \
+ packagegroup-core-lsb-graphic-add \
+ packagegroup-core-lsb-runtime-add \
+ packagegroup-core-lsb-command-add \
"
-RDEPENDS_task-core-sys-extended = "\
+RDEPENDS_packagegroup-core-sys-extended = "\
binutils \
binutils-symlinks \
chkconfig \
@@ -83,19 +83,19 @@ RDEPENDS_task-core-sys-extended = "\
lsbinitscripts \
"
-RDEPENDS_task-core-db = "\
+RDEPENDS_packagegroup-core-db = "\
db \
sqlite3 \
"
-RDEPENDS_task-core-perl = "\
+RDEPENDS_packagegroup-core-perl = "\
gdbm \
perl \
zlib \
"
-RDEPENDS_task-core-python = "\
+RDEPENDS_packagegroup-core-python = "\
expat \
gdbm \
gmp \
@@ -106,11 +106,11 @@ RDEPENDS_task-core-python = "\
zip \
"
-RDEPENDS_task-core-tcl = "\
+RDEPENDS_packagegroup-core-tcl = "\
tcl \
"
-RDEPENDS_task-core-misc = "\
+RDEPENDS_packagegroup-core-misc = "\
elfutils \
gettext \
gettext-runtime \
@@ -128,7 +128,7 @@ RDEPENDS_task-core-misc = "\
zlib \
"
-RDEPENDS_task-core-lsb-command-add = "\
+RDEPENDS_packagegroup-core-lsb-command-add = "\
localedef \
fontconfig-utils \
mailx \
@@ -140,18 +140,18 @@ RDEPENDS_task-core-lsb-command-add = "\
ghostscript \
"
-RDEPENDS_task-core-lsb-perl-add = "\
+RDEPENDS_packagegroup-core-lsb-perl-add = "\
perl-modules \
perl-misc \
perl-pod \
"
-RDEPENDS_task-core-lsb-python-add = "\
+RDEPENDS_packagegroup-core-lsb-python-add = "\
python-modules \
python-misc \
"
-RDEPENDS_task-core-lsb-graphic-add = "\
+RDEPENDS_packagegroup-core-lsb-graphic-add = "\
libqtcore4 \
libqtgui4 \
libqtsql4 \
@@ -178,7 +178,7 @@ RDEPENDS_task-core-lsb-graphic-add = "\
${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
"
-RDEPENDS_task-core-lsb-runtime-add = "\
+RDEPENDS_packagegroup-core-lsb-runtime-add = "\
ldd \
pam-plugin-wheel \
e2fsprogs-mke2fs \
diff --git a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
similarity index 87%
rename from meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
rename to meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 29a4f56..a00ca36 100644
--- a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -10,12 +10,12 @@ PR = "r12"
ALLOW_EMPTY = "1"
-require task-sdk-gmae.inc
+require packagegroup-sdk-gmae.inc
PACKAGES = "${PN}"
RDEPENDS_${PN} = "\
- task-core-sdk \
+ packagegroup-core-sdk \
libglade-dev \
${SDK-GMAE} \
${SDK-EXTRAS}"
diff --git a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
similarity index 85%
rename from meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
rename to meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 45b502f..3b2abdd 100644
--- a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -10,12 +10,12 @@ PR = "r14"
ALLOW_EMPTY = "1"
-require task-sdk-gmae.inc
+require packagegroup-sdk-gmae.inc
PACKAGES = "${PN} ${PN}-dbg"
RDEPENDS_${PN} = "\
- task-core-standalone-sdk-target \
+ packagegroup-core-standalone-sdk-target \
libglade-dev \
${SDK-GMAE} \
${SDK-EXTRAS}"
diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
similarity index 100%
rename from meta/recipes-gnome/tasks/task-sdk-gmae.inc
rename to meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index aa6e2a2..4c5adee 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -7,8 +7,8 @@ LICENSE = "MIT"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
- task-core-clutter-core \
- task-core-clutter-tests \
- task-core-clutter-apps"
+ packagegroup-core-clutter-core \
+ packagegroup-core-clutter-tests \
+ packagegroup-core-clutter-apps"
inherit core-image
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
index dcf5165..868b309 100644
--- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
@@ -6,18 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS += "task-core-gtk-directfb"
+DEPENDS += "packagegroup-core-gtk-directfb"
RDEPENDS_${PN} += " \
- task-core-gtk-directfb-base \
+ packagegroup-core-gtk-directfb-base \
"
inherit core-image
IMAGE_INSTALL += "\
${CORE_IMAGE_BASE_INSTALL} \
- task-core-basic \
- task-core-gtk-directfb-base \
+ packagegroup-core-basic \
+ packagegroup-core-gtk-directfb-base \
"
python __anonymous () {
diff --git a/meta/recipes-graphics/tasks/task-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
similarity index 49%
rename from meta/recipes-graphics/tasks/task-core-clutter.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 4044131..039f5c6 100644
--- a/meta/recipes-graphics/tasks/task-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -10,28 +10,28 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r4"
PACKAGES = "\
- task-core-clutter-core \
- task-core-clutter-core-dbg \
- task-core-clutter-core-dev \
- task-core-clutter-apps \
- task-core-clutter-apps-dbg \
- task-core-clutter-apps-dev \
- task-core-clutter-tests \
- task-core-clutter-tests-dbg \
- task-core-clutter-tests-dev \
+ packagegroup-core-clutter-core \
+ packagegroup-core-clutter-core-dbg \
+ packagegroup-core-clutter-core-dev \
+ packagegroup-core-clutter-apps \
+ packagegroup-core-clutter-apps-dbg \
+ packagegroup-core-clutter-apps-dev \
+ packagegroup-core-clutter-tests \
+ packagegroup-core-clutter-tests-dbg \
+ packagegroup-core-clutter-tests-dev \
"
ALLOW_EMPTY = "1"
-RDEPENDS_task-core-clutter-core = "\
+RDEPENDS_packagegroup-core-clutter-core = "\
clutter-1.8 \
clutter-gst-1.8 \
clutter-gtk-1.8 \
"
-#RDEPENDS_task-core-clutter-tests = "\
+#RDEPENDS_packagegroup-core-clutter-tests = "\
# clutter-gst-1.8-examples \
# clutter-gtk-1.8-examples"
-#RDEPENDS_task-core-clutter-apps = "\
+#RDEPENDS_packagegroup-core-clutter-apps = "\
# clutter-box2d "
diff --git a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
similarity index 96%
rename from meta/recipes-graphics/tasks/task-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 239e0c1..8609013 100644
--- a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-inherit task
+inherit packagegroup
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 8f9478d..205c912 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -5,15 +5,15 @@ PR="r2"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS += "task-qt4e"
+DEPENDS += "packagegroup-qt4e"
RDEPENDS_${PN} += " \
- task-qt4e-base \
+ packagegroup-qt4e-base \
"
IMAGE_INSTALL += "\
${CORE_IMAGE_BASE_INSTALL} \
- task-qt4e-base \
+ packagegroup-qt4e-base \
"
inherit core-image
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 116db91..20dd354 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,7 +1,7 @@
# Qt Embedded toolchain
PR = "r5"
-TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
-TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
+TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target"
TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
require recipes-core/meta/meta-toolchain.bb
diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
similarity index 64%
rename from meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
rename to meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 5098d11..1c53a9c 100644
--- a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
+++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
@@ -1,4 +1,4 @@
-require recipes-core/tasks/nativesdk-task-sdk-host.bb
+require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
DESCRIPTION = "Host packages for Qt Embedded SDK"
LICENSE = "MIT"
diff --git a/meta/recipes-qt/tasks/task-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
similarity index 72%
rename from meta/recipes-qt/tasks/task-core-qt.bb
rename to meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 69512a4..4fe07c6 100644
--- a/meta/recipes-qt/tasks/task-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r3"
PACKAGES = "\
- task-core-qt-demos \
- task-core-qt-demos-dbg \
- task-core-qt-demos-dev \
+ packagegroup-core-qt-demos \
+ packagegroup-core-qt-demos-dbg \
+ packagegroup-core-qt-demos-dev \
"
ALLOW_EMPTY = "1"
@@ -19,4 +19,4 @@ ALLOW_EMPTY = "1"
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
#QTDEMOS_disabled = "fotowall"
-RDEPENDS_task-core-qt-demos = "${QTDEMOS}"
+RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
similarity index 98%
rename from meta/recipes-qt/tasks/task-qt4e.bb
rename to meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index c95c898..4b6d6a7 100644
--- a/meta/recipes-qt/tasks/task-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-inherit task
+inherit packagegroup
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
similarity index 95%
rename from meta/recipes-qt/tasks/task-qte-toolchain-target.bb
rename to meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index 7ee575f..abd6a1f 100644
--- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
RDEPENDS_${PN} += " \
- task-core-standalone-sdk-target \
+ packagegroup-core-standalone-sdk-target \
qt4-embedded-mkspecs \
libqt-embeddedmultimedia4-dev \
libqt-embeddedphonon4-dev \
diff --git a/meta/recipes-sato/tasks/task-core-x11-mini.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
similarity index 85%
rename from meta/recipes-sato/tasks/task-core-x11-mini.bb
rename to meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
index 0aed286..4f3bb47 100644
--- a/meta/recipes-sato/tasks/task-core-x11-mini.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r1"
PACKAGES = "\
- task-core-x11-mini \
- task-core-x11-mini-dbg \
- task-core-x11-mini-dev \
+ packagegroup-core-x11-mini \
+ packagegroup-core-x11-mini-dbg \
+ packagegroup-core-x11-mini-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
-RDEPENDS_task-core-x11-mini = "\
+RDEPENDS_packagegroup-core-x11-mini = "\
dbus \
pointercal \
matchbox-terminal \
diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
similarity index 83%
rename from meta/recipes-sato/tasks/task-core-x11-sato.bb
rename to meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index cf294b3..380584e 100644
--- a/meta/recipes-sato/tasks/task-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
PACKAGES = "\
- task-core-x11-sato \
- task-core-x11-sato-dbg \
- task-core-x11-sato-dev \
+ packagegroup-core-x11-sato \
+ packagegroup-core-x11-sato-dbg \
+ packagegroup-core-x11-sato-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -24,7 +24,7 @@ NETWORK_MANAGER_libc-uclibc = ""
WEB ?= ""
#WEB = "web-webkit"
-RDEPENDS_task-core-x11-sato = "\
+RDEPENDS_packagegroup-core-x11-sato = "\
matchbox-desktop \
matchbox-session-sato \
matchbox-keyboard \
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
similarity index 70%
rename from meta/recipes-sato/tasks/task-core-x11.bb
rename to meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
index 764ea02..4c16c46 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r36"
PACKAGES = "\
- task-core-apps-x11-core \
- task-core-apps-x11-core-dbg \
- task-core-apps-x11-core-dev \
- task-core-apps-x11-games \
- task-core-apps-x11-games-dbg \
- task-core-apps-x11-games-dev \
- task-core-x11-base \
- task-core-x11-base-dbg \
- task-core-x11-base-dev \
+ packagegroup-core-apps-x11-core \
+ packagegroup-core-apps-x11-core-dbg \
+ packagegroup-core-apps-x11-core-dev \
+ packagegroup-core-apps-x11-games \
+ packagegroup-core-apps-x11-games-dbg \
+ packagegroup-core-apps-x11-games-dev \
+ packagegroup-core-x11-base \
+ packagegroup-core-x11-base-dbg \
+ packagegroup-core-x11-base-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -37,7 +37,7 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
-RDEPENDS_task-core-x11-base = "\
+RDEPENDS_packagegroup-core-x11-base = "\
dbus \
pointercal \
matchbox-wm \
@@ -57,12 +57,12 @@ RDEPENDS_task-core-x11-base = "\
xrandr"
-RDEPENDS_task-core-apps-x11-core = "\
+RDEPENDS_packagegroup-core-apps-x11-core = "\
leafpad \
${FILEMANAGER} \
matchbox-terminal \
sato-screenshot"
-RDEPENDS_task-core-apps-x11-games = "\
+RDEPENDS_packagegroup-core-apps-x11-games = "\
oh-puzzles"
diff --git a/scripts/contrib/documentation-audit.sh b/scripts/contrib/documentation-audit.sh
index 5b66f03..a2c4586 100755
--- a/scripts/contrib/documentation-audit.sh
+++ b/scripts/contrib/documentation-audit.sh
@@ -42,7 +42,7 @@ for pkg in `bitbake -s | awk '{ print \$1 }'`; do
# Skip native/nativesdk/cross-canadian recipes
continue
fi
- if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^task- || "$pkg" =~ -image ]]; then
+ if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^packagegroup- || "$pkg" =~ -image ]]; then
# Skip meta, task and image recipes
continue
fi
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 05/28] packagegroup-base: remove some useless items
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (3 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 04/28] Rename task to packagegroup Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 06/28] classes/packagegroup: Use package group nomenclature Paul Eggleton
` (27 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
* Bootloader selection (u-boot, redboot, etc.) is not handled using
feature selection anymore, so remove these packages
* Realistically there are no packages we can always know that need to
be installed for a screen/touchscreen these days, so remove these
* Similarly, all RAID configurations can't be supported just using
one package or list of packages, so remove the raid package.
* Remove default settings of MACHINE_ESSENTIAL_*, these variables
aren't referred to in this recipe.
* Remove some outdated comments
* Fix indenting
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroups/packagegroup-base.bb | 39 ++------------------
1 file changed, 3 insertions(+), 36 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index ea894b2..85acd1f 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -23,16 +23,10 @@ PACKAGES = ' \
${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \
${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \
- ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \
${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \
${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \
\
- ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \
- \
${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \
${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \
${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \
@@ -42,7 +36,6 @@ PACKAGES = ' \
${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \
${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \
${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \
- ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \
${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \
\
'
@@ -55,12 +48,6 @@ ALLOW_EMPTY = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
#
-# those ones can be set in machine config to supply packages needed to get machine booting
-#
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-
-#
# packagegroup-base contain stuff needed for base system (machine related)
#
RDEPENDS_packagegroup-base = "\
@@ -85,9 +72,6 @@ RDEPENDS_packagegroup-base = "\
${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \
- ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \
\
${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \
@@ -95,7 +79,6 @@ RDEPENDS_packagegroup-base = "\
${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \
${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \
${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \
${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
"
@@ -128,13 +111,13 @@ python __anonymous () {
machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
- d.setVar("ADD_BT", "packagegroup-base-bluetooth")
+ d.setVar("ADD_BT", "packagegroup-base-bluetooth")
if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
- d.setVar("ADD_WIFI", "packagegroup-base-wifi")
+ d.setVar("ADD_WIFI", "packagegroup-base-wifi")
if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
- d.setVar("ADD_3G", "packagegroup-base-3g")
+ d.setVar("ADD_3G", "packagegroup-base-3g")
}
#
@@ -188,8 +171,6 @@ RRECOMMENDS_packagegroup-base-alsa = "\
RDEPENDS_packagegroup-base-pcmcia = "\
pcmciautils \
"
-#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
-#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
RRECOMMENDS_packagegroup-base-pcmcia = "\
@@ -203,8 +184,6 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
-# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
-
RDEPENDS_packagegroup-base-bluetooth = "\
bluez4 \
${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
@@ -333,18 +312,6 @@ RRECOMMENDS_packagegroup-base-nfs = "\
RDEPENDS_packagegroup-base-zeroconf = "\
avahi-daemon"
-RDEPENDS_packagegroup-base-raid = "\
- "
-
-RDEPENDS_packagegroup-base-screen = "\
- "
-
-#
-# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
-#
-RDEPENDS_packagegroup-base-touchscreen = "\
- "
-
RDEPENDS_packagegroup-base-ipv6 = "\
"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 06/28] classes/packagegroup: Use package group nomenclature
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (4 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 05/28] packagegroup-base: remove some useless items Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 07/28] packagegroup-core-nfs: remove broken glibc-utils reference Paul Eggleton
` (26 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/packagegroup.bbclass | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 6ec154a..aa9e0ac 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -1,16 +1,18 @@
-# Task packages are only used to pull in other packages
+# Class for packagegroup (package group) recipes
+
+# packagegroup packages are only used to pull in other packages
# via their dependencies. They are empty.
ALLOW_EMPTY = "1"
-# By default, only the task package itself is in PACKAGES.
+# By default, only the packagegroup package itself is in PACKAGES.
# -dbg and -dev flavours are handled by the anonfunc below.
-# This means that task recipes used to build multiple task
-# packages have to modify PACKAGES after inheriting task.bbclass.
+# This means that packagegroup recipes used to build multiple packagegroup
+# packages have to modify PACKAGES after inheriting packagegroup.bbclass.
PACKAGES = "${PN}"
-# By default, task packages do not depend on a certain architecture.
+# By default, packagegroup packages do not depend on a certain architecture.
# Only if dependencies are modified by MACHINE_FEATURES, packages
-# need to be set to MACHINE_ARCH after inheriting task.bbclass
+# need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass
PACKAGE_ARCH = "all"
# This automatically adds -dbg and -dev flavours of all PACKAGES
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 07/28] packagegroup-core-nfs: remove broken glibc-utils reference
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (5 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 06/28] classes/packagegroup: Use package group nomenclature Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 08/28] classes/packagegroup: add ability to disable complementary packages Paul Eggleton
` (25 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
I'm not convinced everyone who wants to serve NFS needs rpcinfo, nor is
it clear that rpcinfo is actually provided as part of eglibc-utils
anymore, so let's just remove this.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroups/packagegroup-core-nfs.bb | 6 ------
1 file changed, 6 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index e63753b..4b1059c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -20,9 +20,3 @@ RDEPENDS_packagegroup-core-nfs-server = "\
nfs-utils \
nfs-utils-client \
"
-
-# rpcinfo can be useful but only with glibc images
-GLIBC_DEPENDENCIES = "glibc-utils"
-
-RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 08/28] classes/packagegroup: add ability to disable complementary packages
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (6 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 07/28] packagegroup-core-nfs: remove broken glibc-utils reference Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 13:25 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 09/28] packagegroup-*: change to inherit from packagegroup.bbclass Paul Eggleton
` (24 subsequent siblings)
32 siblings, 1 reply; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
This allows package group recipes that do not want the automatic
addition of complementary packages (e.g. for SDKs) to still inherit from
this class and thus it becomes very easy to determine if a recipe is a
package group which we need to do in certain circumstances.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/packagegroup.bbclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index aa9e0ac..2e07529 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -19,6 +19,9 @@ PACKAGE_ARCH = "all"
# to the list. Their dependencies (RRECOMMENDS) are handled as usual
# by package_depchains in a following step.
python () {
+ if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
+ return
+
packages = d.getVar('PACKAGES', True).split()
genpackages = []
for pkg in packages:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 08/28] classes/packagegroup: add ability to disable complementary packages
2012-09-03 10:30 ` [PATCH 08/28] classes/packagegroup: add ability to disable complementary packages Paul Eggleton
@ 2012-09-03 13:25 ` Paul Eggleton
0 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 13:25 UTC (permalink / raw)
To: openembedded-core
On Monday 03 September 2012 11:30:28 Paul Eggleton wrote:
> This allows package group recipes that do not want the automatic
> addition of complementary packages (e.g. for SDKs) to still inherit from
> this class and thus it becomes very easy to determine if a recipe is a
> package group which we need to do in certain circumstances.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> meta/classes/packagegroup.bbclass | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/packagegroup.bbclass
> b/meta/classes/packagegroup.bbclass index aa9e0ac..2e07529 100644
> --- a/meta/classes/packagegroup.bbclass
> +++ b/meta/classes/packagegroup.bbclass
> @@ -19,6 +19,9 @@ PACKAGE_ARCH = "all"
> # to the list. Their dependencies (RRECOMMENDS) are handled as usual
> # by package_depchains in a following step.
> python () {
> + if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
Er, that conditional is the wrong way around. Fixed on the branch.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 09/28] packagegroup-*: change to inherit from packagegroup.bbclass
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (7 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 08/28] classes/packagegroup: add ability to disable complementary packages Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 10/28] packagegroup-core-x11: move out Sato applications Paul Eggleton
` (23 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Also clean out items already handled by that class (dev/dbg packages,
ALLOW_EMPTY, etc.)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../nativesdk-packagegroup-sdk-host.bb | 5 ++---
.../packagegroups/packagegroup-base.bb | 2 --
.../packagegroups/packagegroup-core-boot.bb | 16 ++++++---------
.../packagegroups/packagegroup-core-console.bb | 8 +-------
.../packagegroups/packagegroup-core-nfs.bb | 10 +++-------
.../packagegroups/packagegroup-core-sdk.bb | 8 ++------
.../packagegroup-core-ssh-dropbear.bb | 12 ++---------
.../packagegroups/packagegroup-core-ssh-openssh.bb | 12 ++---------
.../packagegroup-core-standalone-sdk-target.bb | 5 +++--
.../packagegroups/packagegroup-core-tools-debug.bb | 8 +-------
.../packagegroup-core-tools-profile.bb | 8 +-------
.../packagegroup-core-tools-testapps.bb | 8 +-------
.../packagegroups/packagegroup-cross-canadian.bb | 6 +++---
.../packagegroups/packagegroup-self-hosted.bb | 4 ++--
.../packagegroups/packagegroup-core-basic.bb | 21 ++------------------
.../packagegroups/packagegroup-core-lsb.bb | 16 ++-------------
.../packagegroups/packagegroup-core-sdk-gmae.bb | 4 ++--
...packagegroup-core-standalone-gmae-sdk-target.bb | 4 ++--
.../packagegroups/packagegroup-core-clutter.bb | 10 ++--------
.../packagegroup-core-gtk-directfb.bb | 6 ++----
.../nativesdk-packagegroup-qte-toolchain-host.bb | 1 -
.../packagegroups/packagegroup-core-qt.bb | 11 +++-------
meta/recipes-qt/packagegroups/packagegroup-qt4e.bb | 6 ++----
.../packagegroup-qte-toolchain-target.bb | 5 ++++-
.../packagegroups/packagegroup-core-x11-mini.bb | 8 +-------
.../packagegroups/packagegroup-core-x11-sato.bb | 8 +-------
.../packagegroups/packagegroup-core-x11.bb | 10 ++--------
27 files changed, 54 insertions(+), 168 deletions(-)
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index ea054bc..ef05004 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -5,14 +5,13 @@
DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
PR = "r11"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-inherit nativesdk
+inherit nativesdk packagegroup
-PACKAGES = "${PN}"
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} = "\
nativesdk-pkgconfig \
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 85acd1f..7e2bd69 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -40,8 +40,6 @@ PACKAGES = ' \
\
'
-ALLOW_EMPTY = "1"
-
#
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 7e80fff..b49fb3f 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -6,11 +6,13 @@ DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS = "virtual/kernel"
-ALLOW_EMPTY = "1"
PR = "r9"
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
#
# Set by the machine configuration with packages essential for device bootup
#
@@ -24,13 +26,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
-PACKAGES = "\
- packagegroup-core-boot \
- packagegroup-core-boot-dbg \
- packagegroup-core-boot-dev \
-"
-
-RDEPENDS_packagegroup-core-boot = "\
+RDEPENDS_${PN} = "\
base-files \
base-passwd \
busybox \
@@ -45,5 +41,5 @@ RDEPENDS_packagegroup-core-boot = "\
${VIRTUAL-RUNTIME_update-alternatives} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-RRECOMMENDS_packagegroup-core-boot = "\
+RRECOMMENDS_${PN} = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
index fd8eb25..63003d0 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-console.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
@@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r35"
-PACKAGES = "\
- packagegroup-core-apps-console \
- packagegroup-core-apps-console-dbg \
- packagegroup-core-apps-console-dev \
- "
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-
SPLASH ?= "psplash"
RDEPENDS_packagegroup-core-apps-console = "\
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 4b1059c..8b2318e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -8,15 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r1"
-PACKAGES = "\
- packagegroup-core-nfs-server \
- packagegroup-core-nfs-server-dbg \
- packagegroup-core-nfs-server-dev \
- "
+inherit packagegroup
-ALLOW_EMPTY = "1"
+PACKAGES = "${PN}-server"
-RDEPENDS_packagegroup-core-nfs-server = "\
+RDEPENDS_${PN}-server = "\
nfs-utils \
nfs-utils-client \
"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 663f705..4ee802f 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -9,13 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
DEPENDS = "packagegroup-core-console"
PR = "r8"
-ALLOW_EMPTY = "1"
-#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
+inherit packagegroup
-PACKAGES = "\
- packagegroup-core-sdk \
- packagegroup-core-sdk-dbg \
- packagegroup-core-sdk-dev"
+#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
RDEPENDS_packagegroup-core-sdk = "\
autoconf \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 9dcc342..a07e2ba 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -4,14 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r0"
-PACKAGES = "\
- packagegroup-core-ssh-dropbear \
- packagegroup-core-ssh-dropbear-dbg \
- packagegroup-core-ssh-dropbear-dev \
- "
+inherit packagegroup
-ALLOW_EMPTY = "1"
-
-RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear"
-RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg"
-RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev"
+RDEPENDS_${PN} = "dropbear"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 7e85b29..89f8c93 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -4,14 +4,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r0"
-PACKAGES = "\
- packagegroup-core-ssh-openssh \
- packagegroup-core-ssh-openssh-dbg \
- packagegroup-core-ssh-openssh-dev \
- "
+inherit packagegroup
-ALLOW_EMPTY = "1"
-
-RDEPENDS_packagegroup-core-ssh-openssh = "openssh"
-RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg"
-RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev"
+RDEPENDS_${PN} = "openssh"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 03628a1..4099d45 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -3,9 +3,10 @@ PR = "r7"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN} ${PN}-dbg"
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} = "\
libgcc \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index b7eff21..be424a3 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -7,18 +7,12 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PACKAGES = "\
- ${PN} \
- ${PN}-dbg \
- ${PN}-dev \
- "
+inherit packagegroup
PR = "r1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-
MTRACE = ""
MTRACE_libc-glibc = "libc-mtrace"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 30776ef..24a99c7 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -7,16 +7,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PACKAGES = "\
- ${PN} \
- ${PN}-dbg \
- ${PN}-dev \
- "
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-
RRECOMMENDS_${PN} = "\
perf \
trace-cmd \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index bdd0d05..52c278a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -7,16 +7,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PACKAGES = "\
- ${PN} \
- ${PN}-dbg \
- ${PN}-dev \
- "
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-
# kexec-tools doesn't work on Mips
KEXECTOOLS ?= "kexec"
KEXECTOOLS_mips ?= ""
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 6ab4a95..8870ccc 100644
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Host SDK package for cross canadian toolchain"
PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
PR = "r0"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-inherit cross-canadian
-PACKAGES = "${PN}"
+inherit cross-canadian packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} = "\
binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 118ff7d..7567457 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -8,6 +8,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+inherit packagegroup
+
PACKAGES = "\
packagegroup-self-hosted \
packagegroup-self-hosted-debug \
@@ -17,8 +19,6 @@ PACKAGES = "\
packagegroup-self-hosted-host-tools \
"
-ALLOW_EMPTY = "1"
-
RDEPENDS_packagegroup-self-hosted = "\
packagegroup-self-hosted-debug \
packagegroup-self-hosted-sdk \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index a7e3eb7..95edd78 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -8,38 +8,21 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+inherit packagegroup
+
PACKAGES = "\
packagegroup-core-basic \
packagegroup-core-base-utils \
- packagegroup-core-base-utils-dbg \
- packagegroup-core-base-utils-dev \
packagegroup-core-basic-libs \
- packagegroup-core-basic-libs-dbg \
- packagegroup-core-basic-libs-dev \
packagegroup-core-basic-utils \
- packagegroup-core-basic-utils-dbg \
- packagegroup-core-basic-utils-dev \
packagegroup-core-basic-extended \
- packagegroup-core-basic-extended-dbg \
- packagegroup-core-basic-extended-dev \
packagegroup-core-dev-utils \
- packagegroup-core-dev-utils-dbg \
- packagegroup-core-dev-utils-dev \
packagegroup-core-multiuser \
- packagegroup-core-multiuser-dbg \
- packagegroup-core-multiuser-dev \
packagegroup-core-initscripts \
- packagegroup-core-initscripts-dbg \
- packagegroup-core-initscripts-dev \
packagegroup-core-rpm \
- packagegroup-core-rpm-dbg \
- packagegroup-core-rpm-dev \
packagegroup-core-sys-services \
- packagegroup-core-sys-services-dbg \
- packagegroup-core-sys-services-dev \
"
-ALLOW_EMPTY = "1"
RDEPENDS_packagegroup-core-basic = "\
packagegroup-core-base-utils \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 984ed36..558db00 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -8,26 +8,16 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+inherit packagegroup
+
PACKAGES = "\
packagegroup-core-lsb \
packagegroup-core-sys-extended \
- packagegroup-core-sys-extended-dbg \
- packagegroup-core-sys-extended-dev \
packagegroup-core-db \
- packagegroup-core-db-dbg \
- packagegroup-core-db-dev \
packagegroup-core-misc \
- packagegroup-core-misc-dbg \
- packagegroup-core-misc-dev \
packagegroup-core-perl \
- packagegroup-core-perl-dbg \
- packagegroup-core-perl-dev \
packagegroup-core-python \
- packagegroup-core-python-dbg \
- packagegroup-core-python-dev \
packagegroup-core-tcl \
- packagegroup-core-tcl-dbg \
- packagegroup-core-tcl-dev \
packagegroup-core-lsb-perl-add \
packagegroup-core-lsb-python-add \
packagegroup-core-lsb-graphic-add \
@@ -36,8 +26,6 @@ PACKAGES = "\
"
-ALLOW_EMPTY = "1"
-
RDEPENDS_packagegroup-core-lsb = "\
packagegroup-core-sys-extended \
packagegroup-core-db \
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index a00ca36..45cffa4 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r12"
-ALLOW_EMPTY = "1"
+inherit packagegroup
require packagegroup-sdk-gmae.inc
-PACKAGES = "${PN}"
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} = "\
packagegroup-core-sdk \
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 3b2abdd..79b3253 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r14"
-ALLOW_EMPTY = "1"
+inherit packagegroup
require packagegroup-sdk-gmae.inc
-PACKAGES = "${PN} ${PN}-dbg"
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} = "\
packagegroup-core-standalone-sdk-target \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 039f5c6..d6ac4f3 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -9,20 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r4"
+inherit packagegroup
+
PACKAGES = "\
packagegroup-core-clutter-core \
- packagegroup-core-clutter-core-dbg \
- packagegroup-core-clutter-core-dev \
packagegroup-core-clutter-apps \
- packagegroup-core-clutter-apps-dbg \
- packagegroup-core-clutter-apps-dev \
packagegroup-core-clutter-tests \
- packagegroup-core-clutter-tests-dbg \
- packagegroup-core-clutter-tests-dev \
"
-ALLOW_EMPTY = "1"
-
RDEPENDS_packagegroup-core-clutter-core = "\
clutter-1.8 \
clutter-gst-1.8 \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 8609013..0c47b6f 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit packagegroup
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+PACKAGES = "${PN}-base"
-PACKAGES += " \
- ${PN}-base \
-"
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
RDEPENDS_${PN}-base = " \
directfb \
diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 1c53a9c..a3c275f 100644
--- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
+++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
@@ -2,6 +2,5 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
DESCRIPTION = "Host packages for Qt Embedded SDK"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
RDEPENDS_${PN} += "nativesdk-qt4-tools"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 4fe07c6..ec5e94b 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -8,15 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r3"
-PACKAGES = "\
- packagegroup-core-qt-demos \
- packagegroup-core-qt-demos-dbg \
- packagegroup-core-qt-demos-dev \
- "
+inherit packagegroup
-ALLOW_EMPTY = "1"
+PACKAGES = "${PN}-demos"
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
-#QTDEMOS_disabled = "fotowall"
-RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}"
+RDEPENDS_${PN}-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index 4b6d6a7..2ee7959 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit packagegroup
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+PACKAGES = "${PN}-base"
-PACKAGES += " \
- ${PN}-base \
-"
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
RDEPENDS_${PN}-base = " \
qt4-embedded \
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index abd6a1f..61466d9 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
@@ -1,12 +1,15 @@
DESCRIPTION = "Target packages for Qt Embedded SDK"
LICENSE = "MIT"
-ALLOW_EMPTY = "1"
PR = "r5"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
RDEPENDS_${PN} += " \
packagegroup-core-standalone-sdk-target \
qt4-embedded-mkspecs \
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
index 4f3bb47..432d99d 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
@@ -8,18 +8,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r1"
-PACKAGES = "\
- packagegroup-core-x11-mini \
- packagegroup-core-x11-mini-dbg \
- packagegroup-core-x11-mini-dev \
- "
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
-ALLOW_EMPTY = "1"
-
ROOTLESS_X = "1"
# xserver-common, x11-common
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 380584e..f38e0d2 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -8,16 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r32"
-PACKAGES = "\
- packagegroup-core-x11-sato \
- packagegroup-core-x11-sato-dbg \
- packagegroup-core-x11-sato-dev \
- "
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
-
NETWORK_MANAGER ?= "connman-gnome"
NETWORK_MANAGER_libc-uclibc = ""
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
index 4c16c46..3fe5cae 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
@@ -8,24 +8,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r36"
+inherit packagegroup
+
PACKAGES = "\
packagegroup-core-apps-x11-core \
- packagegroup-core-apps-x11-core-dbg \
- packagegroup-core-apps-x11-core-dev \
packagegroup-core-apps-x11-games \
- packagegroup-core-apps-x11-games-dbg \
- packagegroup-core-apps-x11-games-dev \
packagegroup-core-x11-base \
- packagegroup-core-x11-base-dbg \
- packagegroup-core-x11-base-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
-ALLOW_EMPTY = "1"
-
# pcmanfm doesn't work on mips/powerpc
FILEMANAGER ?= "pcmanfm"
FILEMANAGER_mips ?= ""
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 10/28] packagegroup-core-x11: move out Sato applications
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (8 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 09/28] packagegroup-*: change to inherit from packagegroup.bbclass Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 11/28] core-image-core: rename to core-image-x11 Paul Eggleton
` (22 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Move Sato applications to packagegroup-core-x11-sato.
Note that this eliminates both the apps-x11-core and apps-x11-games
IMAGE_FEATURES; in practice it is unlikely these were useful to anyone
outside of the Sato images however.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 4 --
meta/recipes-core/images/core-image-core.bb | 5 +--
meta/recipes-graphics/images/core-image-clutter.bb | 2 +-
meta/recipes-sato/images/core-image-sato.bb | 2 +-
.../packagegroups/packagegroup-core-x11-sato.bb | 40 ++++++++++++++++----
.../packagegroups/packagegroup-core-x11.bb | 17 ---------
6 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index a85a9ea..f748552 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - x11-mini - minimal environment for X11 server
# - x11-base - X11 server + minimal desktop
# - x11-sato - OpenedHand Sato environment
-# - apps-x11-core - X Terminal, file manager, file editor
-# - apps-x11-games
# - tools-sdk - SDK
# - tools-debug - debugging tools
# - tools-profile - profiling tools
@@ -31,8 +29,6 @@ PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
-PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
-PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index ea6ba7e..73a707d 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -1,7 +1,6 @@
-DESCRIPTION = "An X11 image with simple applications such as terminal, editor, \
-and file manager."
+DESCRIPTION = "A very basic X11 image with a terminal"
-IMAGE_FEATURES += "apps-console-core package-management x11-base apps-x11-core"
+IMAGE_FEATURES += "apps-console-core package-management x11-base"
LICENSE = "MIT"
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 4c5adee..84ceb27 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 package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 4bbf099..76f9081 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 package-management x11-base apps-x11-core apps-x11-games x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index f38e0d2..b31eaba 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -12,25 +12,51 @@ inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
+
+RDEPENDS_${PN} = "\
+ ${PN}-base \
+ ${PN}-apps \
+ ${PN}-games \
+ "
+
NETWORK_MANAGER ?= "connman-gnome"
NETWORK_MANAGER_libc-uclibc = ""
-WEB ?= ""
-#WEB = "web-webkit"
-
-RDEPENDS_packagegroup-core-x11-sato = "\
+RDEPENDS_${PN}-base = "\
matchbox-desktop \
matchbox-session-sato \
matchbox-keyboard \
+ matchbox-keyboard-applet \
+ matchbox-keyboard-im \
matchbox-stroke \
matchbox-config-gtk \
xcursor-transparent-theme \
sato-icon-theme \
settings-daemon \
gtk-sato-engine \
- gthumb \
- x11vnc \
libsdl \
+ ${NETWORK_MANAGER} \
+ "
+
+# pcmanfm doesn't work on mips
+FILEMANAGER ?= "pcmanfm"
+FILEMANAGER_mips ?= ""
+
+WEB ?= ""
+#WEB = "web-webkit"
+
+RDEPENDS_${PN}-apps = "\
+ gthumb \
+ leafpad \
gaku \
+ x11vnc \
+ matchbox-terminal \
+ sato-screenshot \
+ ${FILEMANAGER} \
${WEB} \
- ${NETWORK_MANAGER}"
+ "
+
+RDEPENDS_${PN}-games = "\
+ oh-puzzles \
+ "
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
index 3fe5cae..b69cc50 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
@@ -11,8 +11,6 @@ PR = "r36"
inherit packagegroup
PACKAGES = "\
- packagegroup-core-apps-x11-core \
- packagegroup-core-apps-x11-games \
packagegroup-core-x11-base \
"
@@ -20,10 +18,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
-# pcmanfm doesn't work on mips/powerpc
-FILEMANAGER ?= "pcmanfm"
-FILEMANAGER_mips ?= ""
-
# xserver-common, x11-common
VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
@@ -49,14 +43,3 @@ RDEPENDS_packagegroup-core-x11-base = "\
xhost \
xset \
xrandr"
-
-
-RDEPENDS_packagegroup-core-apps-x11-core = "\
- leafpad \
- ${FILEMANAGER} \
- matchbox-terminal \
- sato-screenshot"
-
-
-RDEPENDS_packagegroup-core-apps-x11-games = "\
- oh-puzzles"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 11/28] core-image-core: rename to core-image-x11
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (9 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 10/28] packagegroup-core-x11: move out Sato applications Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 12/28] packagegroup-core-x11*: adjust X11 package groups Paul Eggleton
` (21 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Rename to better reflects its purpose, and move under recipes-graphics.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../images/core-image-x11.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/{recipes-core/images/core-image-core.bb => recipes-graphics/images/core-image-x11.bb} (100%)
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-graphics/images/core-image-x11.bb
similarity index 100%
rename from meta/recipes-core/images/core-image-core.bb
rename to meta/recipes-graphics/images/core-image-x11.bb
--
1.7.9.5
^ permalink raw reply [flat|nested] 49+ messages in thread* [PATCH 12/28] packagegroup-core-x11*: adjust X11 package groups
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (10 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 11/28] core-image-core: rename to core-image-x11 Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 13/28] packagegroup-qt4e: tidy up and rename Paul Eggleton
` (20 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Now the Sato pieces have been moved out, rebase packagegroup-core-x11 on
packagegroup-x11-mini but using the structure/contents of meta-oe's
task-x11 so that it can replace that; rename packagegroup-core-x11-mini
to packagegroup-core-x11-base and pull in the xserver/utils packages via
packagegroup-core-x11, and move both of these recipes under
recipes-graphics.
x11-mini is renamed to x11-base as it's what people should build on top
of and since x11-mini is newer, the corresponding IMAGE_FEATURES item is
less likely to be used in existing user recipes.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 6 +--
meta/recipes-core/images/build-appliance-image.bb | 2 +-
.../packagegroups/packagegroup-core-x11-base.bb | 18 ++++++++
.../packagegroups/packagegroup-core-x11.bb} | 24 ++++++-----
meta/recipes-sato/images/core-image-sato.bb | 2 +
.../packagegroups/packagegroup-core-x11.bb | 45 --------------------
6 files changed, 37 insertions(+), 60 deletions(-)
create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
rename meta/{recipes-sato/packagegroups/packagegroup-core-x11-mini.bb => recipes-graphics/packagegroups/packagegroup-core-x11.bb} (78%)
delete mode 100644 meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index f748552..a23d3c8 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# Available IMAGE_FEATURES:
#
# - apps-console-core
-# - x11-mini - minimal environment for X11 server
-# - x11-base - X11 server + minimal desktop
+# - x11 - X server
+# - x11-base - X server with minimal environment
# - x11-sato - OpenedHand Sato environment
# - tools-sdk - SDK
# - tools-debug - debugging tools
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - debug-tweaks - makes an image suitable for development
#
PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
-PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
+PACKAGE_GROUP_x11 = "packagegroup-core-x11"
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index a86daa5..09b0361 100644
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r15"
-IMAGE_FEATURES += "x11-mini package-management"
+IMAGE_FEATURES += "x11-base package-management"
# Ensure there's enough space to do a core-image-sato build, with rm_work enabled
IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
new file mode 100644
index 0000000..eb4b27d
--- /dev/null
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Tasks for core X11 applications"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r0"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = "\
+ packagegroup-core-x11-xserver \
+ packagegroup-core-x11-utils \
+ dbus \
+ pointercal \
+ matchbox-terminal \
+ matchbox-wm \
+ mini-x-session \
+ liberation-fonts \
+ "
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
similarity index 78%
rename from meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 432d99d..9563de0 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -6,15 +6,15 @@ DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r1"
+PR = "r36"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
+PACKAGES = "${PN} ${PN}-xserver ${PN}-utils"
-ROOTLESS_X = "1"
+XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
# xserver-common, x11-common
VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
@@ -22,18 +22,20 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
# elsa, xserver-nodm-init
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+RDEPENDS_${PN} = "\
+ ${PN}-xserver \
+ ${PN}-utils \
+ "
-RDEPENDS_packagegroup-core-x11-mini = "\
- dbus \
- pointercal \
- matchbox-terminal \
- matchbox-wm \
- mini-x-session \
+RDEPENDS_${PN}-xserver = "\
${XSERVER} \
+ "
+
+RDEPENDS_${PN}-utils = "\
${VIRTUAL-RUNTIME_xserver_common} \
${VIRTUAL-RUNTIME_graphical_init_manager} \
- liberation-fonts \
xauth \
xhost \
xset \
- xrandr"
+ xrandr \
+ "
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 76f9081..6b6c761 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -7,3 +7,5 @@ IMAGE_FEATURES += "apps-console-core package-management x11-base x11-sato ssh-se
LICENSE = "MIT"
inherit core-image
+
+IMAGE_INSTALL += "packagegroup-core-x11-sato-games"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
deleted file mode 100644
index b69cc50..0000000
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2011 Intel Corporation
-#
-
-DESCRIPTION = "Tasks for core X11 applications"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r36"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-core-x11-base \
- "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
-
-# xserver-common, x11-common
-VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
-
-# elsa, xserver-nodm-init
-VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
-
-
-RDEPENDS_packagegroup-core-x11-base = "\
- dbus \
- pointercal \
- matchbox-wm \
- matchbox-keyboard \
- matchbox-keyboard-applet \
- matchbox-keyboard-im \
- matchbox-panel-2 \
- matchbox-desktop \
- matchbox-session \
- ${XSERVER} \
- ${VIRTUAL-RUNTIME_xserver_common} \
- ${VIRTUAL-RUNTIME_graphical_init_manager} \
- liberation-fonts \
- xauth \
- xhost \
- xset \
- xrandr"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 13/28] packagegroup-qt4e: tidy up and rename
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (11 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 12/28] packagegroup-core-x11*: adjust X11 package groups Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 14/28] packagegroup-core-gtk-directfb: remove superfluous -base package Paul Eggleton
` (19 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
* Eliminate the -base package, there's only one package and it might as
well be the main one.
* Rename to packagegroup-core-qt4e to match other package group recipes
* Fix and tidy up qt4e-demo-image at the same time
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/images/qt4e-demo-image.bb | 10 ++--------
...kagegroup-qt4e.bb => packagegroup-core-qt4e.bb} | 6 ++----
2 files changed, 4 insertions(+), 12 deletions(-)
rename meta/recipes-qt/packagegroups/{packagegroup-qt4e.bb => packagegroup-core-qt4e.bb} (94%)
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 205c912..9e8b337 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -1,19 +1,13 @@
DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt."
LICENSE = "MIT"
-PR="r2"
+PR = "r3"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS += "packagegroup-qt4e"
-
-RDEPENDS_${PN} += " \
- packagegroup-qt4e-base \
- "
-
IMAGE_INSTALL += "\
${CORE_IMAGE_BASE_INSTALL} \
- packagegroup-qt4e-base \
+ packagegroup-core-qt4e \
"
inherit core-image
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
similarity index 94%
rename from meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
rename to meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 2ee7959..2ea9c2e 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit packagegroup
-PACKAGES = "${PN}-base"
-
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
-RDEPENDS_${PN}-base = " \
+RDEPENDS_${PN} = " \
qt4-embedded \
libqt-embedded3support4 \
libqt-embeddedclucene4 \
@@ -48,7 +46,7 @@ RDEPENDS_${PN}-base = " \
qt4-embedded-assistant \
"
-RRECOMMENDS_${PN}-base = " \
+RRECOMMENDS_${PN} = " \
libqt-embeddedxmlpatterns4 \
"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 14/28] packagegroup-core-gtk-directfb: remove superfluous -base package
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (12 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 13/28] packagegroup-qt4e: tidy up and rename Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec Paul Eggleton
` (18 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
There's only one package, just make it the main one; also update
core-image-gtk-directfb to match and tidy it up a bit.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../images/core-image-gtk-directfb.bb | 8 +-------
.../packagegroup-core-gtk-directfb.bb | 4 +---
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
index 868b309..05f03cd 100644
--- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
@@ -6,18 +6,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS += "packagegroup-core-gtk-directfb"
-
-RDEPENDS_${PN} += " \
- packagegroup-core-gtk-directfb-base \
- "
-
inherit core-image
IMAGE_INSTALL += "\
${CORE_IMAGE_BASE_INSTALL} \
packagegroup-core-basic \
- packagegroup-core-gtk-directfb-base \
+ packagegroup-core-gtk-directfb \
"
python __anonymous () {
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 0c47b6f..2f35b34 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit packagegroup
-PACKAGES = "${PN}-base"
-
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
-RDEPENDS_${PN}-base = " \
+RDEPENDS_${PN} = " \
directfb \
directfb-examples \
pango \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (13 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 14/28] packagegroup-core-gtk-directfb: remove superfluous -base package Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:35 ` Phil Blundell
2012-09-03 10:30 ` [PATCH 16/28] packagegroup-core-gtk-directfb: remove dropbear Paul Eggleton
` (17 subsequent siblings)
32 siblings, 1 reply; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
openswan was only ever provided in unmaintained form in meta-demoapps
which has been removed, so we never really provided it in OE-Core.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroups/packagegroup-base.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 7e2bd69..c0f0f52 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -255,7 +255,7 @@ RRECOMMENDS_packagegroup-base-ppp = "\
kernel-module-slhc"
RDEPENDS_packagegroup-base-ipsec = "\
- openswan"
+ "
RRECOMMENDS_packagegroup-base-ipsec = "\
kernel-module-ipsec"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:30 ` [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec Paul Eggleton
@ 2012-09-03 10:35 ` Phil Blundell
2012-09-03 10:37 ` Paul Eggleton
0 siblings, 1 reply; 49+ messages in thread
From: Phil Blundell @ 2012-09-03 10:35 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
> openswan was only ever provided in unmaintained form in meta-demoapps
> which has been removed, so we never really provided it in OE-Core.
Isn't packagegroup-base-ipsec rather useless without it?
p.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:35 ` Phil Blundell
@ 2012-09-03 10:37 ` Paul Eggleton
2012-09-03 10:50 ` Phil Blundell
0 siblings, 1 reply; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:37 UTC (permalink / raw)
To: Phil Blundell; +Cc: openembedded-core
On Monday 03 September 2012 11:35:24 Phil Blundell wrote:
> On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
> > openswan was only ever provided in unmaintained form in meta-demoapps
> > which has been removed, so we never really provided it in OE-Core.
>
> Isn't packagegroup-base-ipsec rather useless without it?
If you ignore the RRECOMMENDS line that follows, yes.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:37 ` Paul Eggleton
@ 2012-09-03 10:50 ` Phil Blundell
2012-09-03 10:54 ` Paul Eggleton
0 siblings, 1 reply; 49+ messages in thread
From: Phil Blundell @ 2012-09-03 10:50 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On Mon, 2012-09-03 at 11:37 +0100, Paul Eggleton wrote:
> On Monday 03 September 2012 11:35:24 Phil Blundell wrote:
> > On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
> > > openswan was only ever provided in unmaintained form in meta-demoapps
> > > which has been removed, so we never really provided it in OE-Core.
> >
> > Isn't packagegroup-base-ipsec rather useless without it?
>
> If you ignore the RRECOMMENDS line that follows, yes.
Is there a meaningful use-case where installing kernel-module-ipsec
without any user-space support is a desirable thing to do? And, even if
the answer is yes, is it really valuable to have a
packagegroup-base-ipsec which just recommends a single other package
without doing anything else?
p.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:50 ` Phil Blundell
@ 2012-09-03 10:54 ` Paul Eggleton
2012-09-03 16:25 ` Koen Kooi
2012-09-04 10:33 ` Phil Blundell
0 siblings, 2 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:54 UTC (permalink / raw)
To: Phil Blundell; +Cc: openembedded-core
On Monday 03 September 2012 11:50:01 Phil Blundell wrote:
> On Mon, 2012-09-03 at 11:37 +0100, Paul Eggleton wrote:
> > On Monday 03 September 2012 11:35:24 Phil Blundell wrote:
> > > On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
> > > > openswan was only ever provided in unmaintained form in meta-demoapps
> > > > which has been removed, so we never really provided it in OE-Core.
> > >
> > > Isn't packagegroup-base-ipsec rather useless without it?
> >
> > If you ignore the RRECOMMENDS line that follows, yes.
>
> Is there a meaningful use-case where installing kernel-module-ipsec
> without any user-space support is a desirable thing to do? And, even if
> the answer is yes, is it really valuable to have a
> packagegroup-base-ipsec which just recommends a single other package
> without doing anything else?
The idea is supposed to be that just having "ipsec" in DISTRO_FEATURES brings
in what we can to support IPsec, assuming your image uses packagegroup-base
that is.
I'd be more than happy if we went the other way and decided that IPsec was
something worth fully supporting in OE-Core, and brought in the corresponding
user-space bits as a result; but that's somewhat outside of the scope of this
work.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:54 ` Paul Eggleton
@ 2012-09-03 16:25 ` Koen Kooi
2012-09-03 16:34 ` Paul Eggleton
2012-09-04 10:33 ` Phil Blundell
1 sibling, 1 reply; 49+ messages in thread
From: Koen Kooi @ 2012-09-03 16:25 UTC (permalink / raw)
To: Paul Eggleton; +Cc: Phil Blundell, openembedded-core
Op 3 sep. 2012, om 12:54 heeft Paul Eggleton <paul.eggleton@linux.intel.com> het volgende geschreven:
> On Monday 03 September 2012 11:50:01 Phil Blundell wrote:
>> On Mon, 2012-09-03 at 11:37 +0100, Paul Eggleton wrote:
>>> On Monday 03 September 2012 11:35:24 Phil Blundell wrote:
>>>> On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
>>>>> openswan was only ever provided in unmaintained form in meta-demoapps
>>>>> which has been removed, so we never really provided it in OE-Core.
>>>>
>>>> Isn't packagegroup-base-ipsec rather useless without it?
>>>
>>> If you ignore the RRECOMMENDS line that follows, yes.
>>
>> Is there a meaningful use-case where installing kernel-module-ipsec
>> without any user-space support is a desirable thing to do? And, even if
>> the answer is yes, is it really valuable to have a
>> packagegroup-base-ipsec which just recommends a single other package
>> without doing anything else?
>
> The idea is supposed to be that just having "ipsec" in DISTRO_FEATURES brings
> in what we can to support IPsec, assuming your image uses packagegroup-base
> that is.
Isn't that an IMAGE_FEATURE?
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 16:25 ` Koen Kooi
@ 2012-09-03 16:34 ` Paul Eggleton
0 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 16:34 UTC (permalink / raw)
To: Koen Kooi; +Cc: Phil Blundell, openembedded-core
On Monday 03 September 2012 18:25:35 Koen Kooi wrote:
> Op 3 sep. 2012, om 12:54 heeft Paul Eggleton <paul.eggleton@linux.intel.com>
het volgende geschreven:
> > On Monday 03 September 2012 11:50:01 Phil Blundell wrote:
> >> On Mon, 2012-09-03 at 11:37 +0100, Paul Eggleton wrote:
> >>> On Monday 03 September 2012 11:35:24 Phil Blundell wrote:
> >>>> On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
> >>>>> openswan was only ever provided in unmaintained form in meta-demoapps
> >>>>> which has been removed, so we never really provided it in OE-Core.
> >>>>
> >>>> Isn't packagegroup-base-ipsec rather useless without it?
> >>>
> >>> If you ignore the RRECOMMENDS line that follows, yes.
> >>
> >> Is there a meaningful use-case where installing kernel-module-ipsec
> >> without any user-space support is a desirable thing to do? And, even if
> >> the answer is yes, is it really valuable to have a
> >> packagegroup-base-ipsec which just recommends a single other package
> >> without doing anything else?
> >
> > The idea is supposed to be that just having "ipsec" in DISTRO_FEATURES
> > brings in what we can to support IPsec, assuming your image uses
> > packagegroup-base that is.
>
> Isn't that an IMAGE_FEATURE?
It has been implemented within DISTRO_FEATURES since long ago in the OE-
Classic days. We could move it to IMAGE_FEATURES or simply have it as a
package group on its own, however the minute we have something that requires
enabling/disabling IPsec at configure time it will break. A cursory google
search suggests this is not an unlikely situation although not one we actually
face right now.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec
2012-09-03 10:54 ` Paul Eggleton
2012-09-03 16:25 ` Koen Kooi
@ 2012-09-04 10:33 ` Phil Blundell
1 sibling, 0 replies; 49+ messages in thread
From: Phil Blundell @ 2012-09-04 10:33 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On Mon, 2012-09-03 at 11:54 +0100, Paul Eggleton wrote:
> The idea is supposed to be that just having "ipsec" in DISTRO_FEATURES brings
> in what we can to support IPsec, assuming your image uses packagegroup-base
> that is.
>
> I'd be more than happy if we went the other way and decided that IPsec was
> something worth fully supporting in OE-Core, and brought in the corresponding
> user-space bits as a result; but that's somewhat outside of the scope of this
> work.
Yeah, fair enough. I would also like to see proper IPsec support in
oe-core but, if we aren't going to do that, it seems as though this
packagegroup should just be deleted (even if temporarily). Having a
half-baked "ipsec" task which doesn't actually serve any useful purpose
seems like it would just be annoying.
p.
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 16/28] packagegroup-core-gtk-directfb: remove dropbear
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (14 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 15/28] packagegroup-base: remove openswan from packagegroup-base-ipsec Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 17/28] classes/packagegroup: disable superfluous tasks Paul Eggleton
` (16 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
This is unrelated and does not belong in this package group.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroup-core-gtk-directfb.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 2f35b34..19eea99 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -17,6 +17,5 @@ RDEPENDS_${PN} = " \
fontconfig \
gtk+ \
gtk-demo \
- dropbear \
${TOUCH} \
"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 17/28] classes/packagegroup: disable superfluous tasks
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (15 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 16/28] packagegroup-core-gtk-directfb: remove dropbear Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 18/28] packagegroup-*: drop LIC_FILES_CHKSUM Paul Eggleton
` (15 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Disable tasks other than do_package* (similar to how image.bbclass
disables everything except do_rootfs). This saves a little time as well
as neatly avoiding the LIC_FILES_CHKSUM verification within do_configure
which is not needed for package groups.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/packagegroup.bbclass | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 2e07529..f6b7d2d 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -33,3 +33,12 @@ python () {
# We don't want to look at shared library dependencies for the
# dbg packages
DEPCHAIN_DBGDEFAULTDEPS = "1"
+
+# We only need the packaging tasks - disable the rest
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_populate_sysroot[noexec] = "1"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 18/28] packagegroup-*: drop LIC_FILES_CHKSUM
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (16 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 17/28] classes/packagegroup: disable superfluous tasks Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 19/28] packagegroup-core-clutter: remove empty -apps/-tests tasks Paul Eggleton
` (14 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Since package groups don't actually fetch or distribute anything and we
no longer run do_configure we don't need to set this variable anymore.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../nativesdk-packagegroup-sdk-host.bb | 3 ---
.../packagegroups/packagegroup-base.bb | 2 --
.../packagegroups/packagegroup-core-boot.bb | 2 --
.../packagegroups/packagegroup-core-console.bb | 2 --
.../packagegroups/packagegroup-core-nfs.bb | 2 --
.../packagegroups/packagegroup-core-sdk.bb | 2 --
.../packagegroup-core-ssh-dropbear.bb | 2 --
.../packagegroups/packagegroup-core-ssh-openssh.bb | 2 --
.../packagegroup-core-standalone-sdk-target.bb | 2 --
.../packagegroups/packagegroup-core-tools-debug.bb | 2 --
.../packagegroup-core-tools-profile.bb | 2 --
.../packagegroup-core-tools-testapps.bb | 2 --
.../packagegroups/packagegroup-cross-canadian.bb | 3 ---
.../packagegroups/packagegroup-self-hosted.bb | 2 --
.../packagegroups/packagegroup-core-basic.bb | 2 --
.../packagegroups/packagegroup-core-lsb.bb | 2 --
.../packagegroups/packagegroup-core-sdk-gmae.bb | 2 --
...packagegroup-core-standalone-gmae-sdk-target.bb | 2 --
.../packagegroups/packagegroup-core-clutter.bb | 2 --
.../packagegroup-core-gtk-directfb.bb | 3 ---
.../packagegroups/packagegroup-core-x11-base.bb | 2 --
.../packagegroups/packagegroup-core-x11.bb | 2 --
.../packagegroups/packagegroup-core-qt.bb | 2 --
.../packagegroups/packagegroup-core-qt4e.bb | 3 ---
.../packagegroup-qte-toolchain-target.bb | 3 ---
.../packagegroups/packagegroup-core-x11-sato.bb | 2 --
26 files changed, 57 deletions(-)
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index ef05004..39bb594 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -6,9 +6,6 @@ DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
PR = "r11"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
inherit nativesdk packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index c0f0f52..46db72d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -1,7 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r75"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index b49fb3f..a2970d9 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "virtual/kernel"
PR = "r9"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
index 63003d0..0c5e7f1 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-console.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Tasks for core console applications"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r35"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 8b2318e..7b9abdd 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "NFS tasks for Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r1"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 4ee802f..8d7bbac 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "packagegroup-core-console"
PR = "r8"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index a07e2ba..dd47d0c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -1,7 +1,5 @@
DESCRIPTION = "Dropbear SSH task for Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r0"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 89f8c93..8a61b4f 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -1,7 +1,5 @@
DESCRIPTION = "OpenSSH SSH task for Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r0"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 4099d45..078e7dd 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -1,8 +1,6 @@
DESCRIPTION = "Target packages for the standalone SDK"
PR = "r7"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index be424a3..06903a4 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Debug tools tasks for OE-Core"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 24a99c7..bdf0d74 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Profile tools tasks for OE-Core"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 52c278a..500f119 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Test apps task for OE-Core"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 8870ccc..fcae851 100644
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -3,9 +3,6 @@ PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
PR = "r0"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
inherit cross-canadian packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 7567457..67e3f3c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -5,8 +5,6 @@
DESCRIPTION = "Create Basic Image Tasks"
PR = "r11"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index 95edd78..b2489fe 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -5,8 +5,6 @@
DESCRIPTION = "Create Basic Image Tasks"
PR = "r4"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 558db00..0e3998d 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -5,8 +5,6 @@
DESCRIPTION = "Create Small Image Tasks"
PR = "r9"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit packagegroup
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 45cffa4..782df1f 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r12"
inherit packagegroup
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 79b3253..c560049 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r14"
inherit packagegroup
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index d6ac4f3..b928096 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r4"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 19eea99..df22cd5 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -2,9 +2,6 @@ DESCRIPTION = "gkt+ over directfb without x11"
PR = "r0"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
inherit packagegroup
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index eb4b27d..1f17f01 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -1,7 +1,5 @@
DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r0"
inherit packagegroup
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 9563de0..7099c70 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r36"
inherit packagegroup
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index ec5e94b..579ca15 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Qt Tasks for Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r3"
inherit packagegroup
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 2ea9c2e..de8341b 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -2,9 +2,6 @@ DESCRIPTION = "QT4 Embedded base Image Feed"
PR = "r1"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
inherit packagegroup
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index 61466d9..7b65bcc 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
@@ -3,9 +3,6 @@ LICENSE = "MIT"
PR = "r5"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
inherit packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index b31eaba..ebd2df1 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -4,8 +4,6 @@
DESCRIPTION = "Sato Tasks for Poky"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r32"
inherit packagegroup
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 19/28] packagegroup-core-clutter: remove empty -apps/-tests tasks
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (17 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 18/28] packagegroup-*: drop LIC_FILES_CHKSUM Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 20/28] packagegroup-core-qt: rename -demos to -demoapps Paul Eggleton
` (13 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
These aren't useful at the moment, so remove them and all references to
them.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-graphics/images/core-image-clutter.bb | 3 +--
.../packagegroups/packagegroup-core-clutter.bb | 13 ++-----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 84ceb27..496246e 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -8,7 +8,6 @@ LICENSE = "MIT"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
packagegroup-core-clutter-core \
- packagegroup-core-clutter-tests \
- packagegroup-core-clutter-apps"
+ "
inherit core-image
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index b928096..2c62820 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -10,20 +10,11 @@ PR = "r4"
inherit packagegroup
PACKAGES = "\
- packagegroup-core-clutter-core \
- packagegroup-core-clutter-apps \
- packagegroup-core-clutter-tests \
+ ${PN}-core \
"
-RDEPENDS_packagegroup-core-clutter-core = "\
+RDEPENDS_${PN}-core = "\
clutter-1.8 \
clutter-gst-1.8 \
clutter-gtk-1.8 \
"
-
-#RDEPENDS_packagegroup-core-clutter-tests = "\
-# clutter-gst-1.8-examples \
-# clutter-gtk-1.8-examples"
-
-#RDEPENDS_packagegroup-core-clutter-apps = "\
-# clutter-box2d "
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 20/28] packagegroup-core-qt: rename -demos to -demoapps
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (18 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 19/28] packagegroup-core-clutter: remove empty -apps/-tests tasks Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 21/28] packagegroup-core-console: remove Paul Eggleton
` (12 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Try to avoid confusion with the Qt demos distributed with Qt itself.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 2 +-
.../packagegroups/packagegroup-core-qt.bb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index a23d3c8..6a391d5 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -37,7 +37,7 @@ PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
-PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos"
+PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps"
# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 579ca15..d59cb4b 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -8,8 +8,8 @@ PR = "r3"
inherit packagegroup
-PACKAGES = "${PN}-demos"
+PACKAGES = "${PN}-demoapps"
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
-RDEPENDS_${PN}-demos = "${QTDEMOS}"
+RDEPENDS_${PN}-demoapps = "${QTDEMOS}"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 21/28] packagegroup-core-console: remove
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (19 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 20/28] packagegroup-core-qt: rename -demos to -demoapps Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 22/28] connman: add runtime dependency on dbus Paul Eggleton
` (11 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
This provides one package group, packagegroup-core-apps-console, which
is usually brought in by adding "apps-console-core" to IMAGE_FEATURES.
Aside from the naming inconsistencies, this is a group of mostly
unrelated packages, none of which are actually "apps". Handling each
one:
* dbus: should mostly be brought in by package runtime dependencies
* avahi-daemon: if you are using packagegroup-base (as all images that
inherit from core-image do) this is brought in by having "zeroconf" in
DISTRO_FEATURES.
* portmap: not very useful by itself; should be brought in by selecting
NFS server/client through other means.
* psplash (or whatever SPLASH is set to): this has been changed to be
an explicit item "splash" in IMAGE_FEATURES. Since this is a fairly
fundamental feature, a piece of code has been added to automatically
handle this for images still using apps-console-core (and show a
warning).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 10 ++++++++--
meta/classes/image.bbclass | 4 ++++
meta/recipes-core/images/core-image-base.bb | 2 +-
.../packagegroups/packagegroup-core-console.bb | 20 --------------------
.../packagegroups/packagegroup-core-sdk.bb | 1 -
meta/recipes-extended/images/core-image-basic.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +-
meta/recipes-extended/images/core-image-lsb.bb | 2 +-
meta/recipes-graphics/images/core-image-clutter.bb | 2 +-
meta/recipes-graphics/images/core-image-x11.bb | 2 +-
meta/recipes-sato/images/core-image-sato.bb | 2 +-
12 files changed, 20 insertions(+), 31 deletions(-)
delete mode 100644 meta/recipes-core/packagegroups/packagegroup-core-console.bb
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 6a391d5..2bfadb4 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
#
# Available IMAGE_FEATURES:
#
-# - apps-console-core
# - x11 - X server
# - x11-base - X server with minimal environment
# - x11-sato - OpenedHand Sato environment
@@ -25,7 +24,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - ssh-server-openssh - SSH server (openssh)
# - debug-tweaks - makes an image suitable for development
#
-PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
PACKAGE_GROUP_x11 = "packagegroup-core-x11"
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
@@ -47,6 +45,14 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2'
# An error exception would be raised if both image features foo and bar1(or bar2) are included
+python __anonymous() {
+ # Ensure we still have a splash screen for existing images
+ if base_contains("IMAGE_FEATURES", "apps-console-core", "1", "", d) == "1":
+ bb.warn("%s: apps-console-core in IMAGE_FEATURES is no longer supported; adding \"splash\" to enable splash screen" % d.getVar("PN", True))
+ d.appendVar("IMAGE_FEATURES", " splash")
+}
+
+
CORE_IMAGE_BASE_INSTALL = '\
packagegroup-core-boot \
packagegroup-base-extended \
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0f6ab38..2e95556 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -39,6 +39,10 @@ def normal_groups(d):
features = set(oe.data.typed_value('IMAGE_FEATURES', d))
return features.difference(extras)
+# Define some very basic feature package groups
+SPLASH ?= "psplash"
+PACKAGE_GROUP_splash = "${SPLASH}"
+
# Wildcards specifying complementary packages to install for every package that has been explicitly
# installed into the rootfs
def complementary_globs(featurevar, d):
diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb
index 30c8dd1..8ef3376 100644
--- a/meta/recipes-core/images/core-image-base.bb
+++ b/meta/recipes-core/images/core-image-base.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "A console-only image that fully supports the target device \
hardware."
-IMAGE_FEATURES += "apps-console-core"
+IMAGE_FEATURES += "splash"
LICENSE = "MIT"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
deleted file mode 100644
index 0c5e7f1..0000000
--- a/meta/recipes-core/packagegroups/packagegroup-core-console.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2011 Intel Corporation
-#
-
-DESCRIPTION = "Tasks for core console applications"
-LICENSE = "MIT"
-PR = "r35"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SPLASH ?= "psplash"
-
-RDEPENDS_packagegroup-core-apps-console = "\
- avahi-daemon \
- dbus \
- portmap \
- ${SPLASH}"
-
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 8d7bbac..e944ec5 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -4,7 +4,6 @@
DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
LICENSE = "MIT"
-DEPENDS = "packagegroup-core-console"
PR = "r8"
inherit packagegroup
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 9aa880e..06f15a8 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "A foundational basic image without support for X that can be \
reasonably used for customization."
-IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
+IMAGE_FEATURES += "splash ssh-server-openssh"
IMAGE_INSTALL = "\
packagegroup-core-boot \
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 557259b..013efb9 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for development work. It \
can be used for customization and implementations that conform to Linux \
Standard Base (LSB)."
-IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
+IMAGE_FEATURES += "splash dev-pkgs ssh-server-openssh"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index d07f90d..abddb76 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image without X support suitable for Linux Standard Base \
(LSB) implementations. It includes the full meta-toolchain, plus development \
headers and libraries to form a standalone SDK."
-IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
+IMAGE_FEATURES += "splash tools-sdk dev-pkgs ssh-server-openssh \
tools-debug tools-profile tools-testapps debug-tweaks"
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 8435596..2c47dc6 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A foundational basic image without support for X that can be \
reasonably used for customization and is suitable for implementations that \
conform to Linux Standard Base (LSB)."
-IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
+IMAGE_FEATURES += "splash ssh-server-openssh"
IMAGE_INSTALL = "\
${CORE_IMAGE_BASE_INSTALL} \
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 496246e..b0f25cf 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 package-management x11-base x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"
diff --git a/meta/recipes-graphics/images/core-image-x11.bb b/meta/recipes-graphics/images/core-image-x11.bb
index 73a707d..64dc053 100644
--- a/meta/recipes-graphics/images/core-image-x11.bb
+++ b/meta/recipes-graphics/images/core-image-x11.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "A very basic X11 image with a terminal"
-IMAGE_FEATURES += "apps-console-core package-management x11-base"
+IMAGE_FEATURES += "splash package-management x11-base"
LICENSE = "MIT"
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 6b6c761..f52a1a5 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 package-management x11-base x11-sato ssh-server-dropbear"
+IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear"
LICENSE = "MIT"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 22/28] connman: add runtime dependency on dbus
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (20 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 21/28] packagegroup-core-console: remove Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 23/28] ofono: " Paul Eggleton
` (10 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
connman's sole configuration interface is its dbus interface, so it
really requires it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 0f96202..59ec1fa 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
-INC_PR = "r16"
+INC_PR = "r17"
TIST = "--enable-tist"
TIST_powerpc = ""
@@ -87,6 +87,7 @@ RPROVIDES_${PN} = "\
"
RDEPENDS_${PN} = "\
+ dbus \
${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 23/28] ofono: add runtime dependency on dbus
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (21 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 22/28] connman: add runtime dependency on dbus Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 24/28] packagegroup-*: set reasonable SUMMARY/DESCRIPTION Paul Eggleton
` (9 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
ofono's sole configuration interface is its dbus interface, so it really
requires it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-connectivity/ofono/ofono.inc | 2 ++
meta/recipes-connectivity/ofono/ofono_git.bb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 573c778..48513b2 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -19,6 +19,8 @@ do_install_append() {
PACKAGES =+ "${PN}-tests"
+RDEPENDS_${PN} += "dbus"
+
FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
FILES_${PN}-tests = "${libdir}/ofono"
RDEPENDS_${PN}-tests = "python python-pygobject"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index 0a69fff..f79f34f 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -3,7 +3,7 @@ require ofono.inc
S = "${WORKDIR}/git"
SRCREV = "14544d5996836f628613c2ce544380ee6fc8f514"
PV = "0.12-git${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
file://ofono"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 24/28] packagegroup-*: set reasonable SUMMARY/DESCRIPTION
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (22 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 23/28] ofono: " Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 25/28] packagegroup-core-basic: tidy up Paul Eggleton
` (8 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../nativesdk-packagegroup-sdk-host.bb | 2 +-
.../packagegroups/packagegroup-base.bb | 27 +++++++++++++++++++-
.../packagegroups/packagegroup-core-boot.bb | 3 ++-
.../packagegroups/packagegroup-core-nfs.bb | 3 ++-
.../packagegroups/packagegroup-core-sdk.bb | 2 +-
.../packagegroup-core-ssh-dropbear.bb | 2 +-
.../packagegroups/packagegroup-core-ssh-openssh.bb | 2 +-
.../packagegroups/packagegroup-core-tools-debug.bb | 2 +-
.../packagegroup-core-tools-profile.bb | 2 +-
.../packagegroup-core-tools-testapps.bb | 2 +-
.../packagegroups/packagegroup-cross-canadian.bb | 2 +-
.../packagegroups/packagegroup-self-hosted.bb | 3 ++-
.../packagegroups/packagegroup-core-lsb.bb | 3 ++-
.../packagegroups/packagegroup-core-sdk-gmae.bb | 2 +-
...packagegroup-core-standalone-gmae-sdk-target.bb | 2 +-
.../packagegroups/packagegroup-core-clutter.bb | 3 ++-
.../packagegroup-core-gtk-directfb.bb | 2 +-
.../packagegroups/packagegroup-core-x11-base.bb | 3 ++-
.../packagegroups/packagegroup-core-x11.bb | 4 ++-
.../packagegroups/packagegroup-core-qt.bb | 3 ++-
.../packagegroups/packagegroup-core-qt4e.bb | 2 +-
.../packagegroups/packagegroup-core-x11-sato.bb | 5 +++-
22 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index 39bb594..63fea28 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd
#
-DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
+SUMMARY = "Host packages for the standalone SDK or external toolchain"
PR = "r11"
LICENSE = "MIT"
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 46db72d..f151591 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -119,6 +119,7 @@ python __anonymous () {
#
# packages added by distribution
#
+SUMMARY_packagegroup-distro-base = "${DISTRO} extras"
DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}"
RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
@@ -126,35 +127,44 @@ RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
#
# packages added by machine config
#
+SUMMARY_packagegroup-machine-base = "${MACHINE} extras"
+DESCRIPTION_packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware"
RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
+SUMMARY_packagegroup-base-keyboard = "Keyboard support"
RDEPENDS_packagegroup-base-keyboard = "\
keymaps"
+SUMMARY_packagegroup-base-pci = "PCI bus support"
RDEPENDS_packagegroup-base-pci = "\
pciutils"
+SUMMARY_packagegroup-base-acpi = "ACPI support"
RDEPENDS_packagegroup-base-acpi = "\
acpid \
libacpi "
+SUMMARY_packagegroup-base-apm = "APM support"
RDEPENDS_packagegroup-base-apm = "\
${VIRTUAL-RUNTIME_apm} \
apmd"
+SUMMARY_packagegroup-base-ext2 = "ext2 filesystem support"
RDEPENDS_packagegroup-base-ext2 = "\
hdparm \
e2fsprogs \
e2fsprogs-e2fsck \
e2fsprogs-mke2fs"
+SUMMARY_packagegroup-base-vfat = "FAT filesystem support"
RRECOMMENDS_packagegroup-base-vfat = "\
kernel-module-msdos \
kernel-module-vfat \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437"
+SUMMARY_packagegroup-base-alsa = "ALSA sound support"
RDEPENDS_packagegroup-base-alsa = "\
alsa-utils-alsactl \
alsa-utils-alsamixer \
@@ -164,11 +174,11 @@ RRECOMMENDS_packagegroup-base-alsa = "\
kernel-module-snd-mixer-oss \
kernel-module-snd-pcm-oss"
+SUMMARY_packagegroup-base-pcmcia = "PC card slot support"
RDEPENDS_packagegroup-base-pcmcia = "\
pcmciautils \
"
-
RRECOMMENDS_packagegroup-base-pcmcia = "\
kernel-module-pcmcia \
kernel-module-airo-cs \
@@ -180,6 +190,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
+SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
RDEPENDS_packagegroup-base-bluetooth = "\
bluez4 \
${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
@@ -201,6 +212,7 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
"
+SUMMARY_packagegroup-base-irda = "IrDA support"
RDEPENDS_packagegroup-base-irda = "\
irda-utils"
@@ -217,6 +229,7 @@ RRECOMMENDS_packagegroup-base-irda = "\
kernel-module-sir-dev \
${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
+SUMMARY_packagegroup-base-usbgadget = "USB gadget support"
RRECOMMENDS_packagegroup-base-usbgadget = "\
kernel-module-pxa27x_udc \
kernel-module-gadgetfs \
@@ -224,6 +237,7 @@ RRECOMMENDS_packagegroup-base-usbgadget = "\
kernel-module-g-serial \
kernel-module-g-ether"
+SUMMARY_packagegroup-base-usbhost = "USB host support"
RDEPENDS_packagegroup-base-usbhost = "\
usbutils "
@@ -241,6 +255,7 @@ RRECOMMENDS_packagegroup-base-usbhost = "\
kernel-module-usbserial \
kernel-module-usb-storage "
+SUMMARY_packagegroup-base-ppp = "PPP dial-up protocol support"
RDEPENDS_packagegroup-base-ppp = "\
ppp \
ppp-dialin"
@@ -252,6 +267,7 @@ RRECOMMENDS_packagegroup-base-ppp = "\
kernel-module-ppp-mppe \
kernel-module-slhc"
+SUMMARY_packagegroup-base-ipsec = "IPSEC support"
RDEPENDS_packagegroup-base-ipsec = "\
"
@@ -262,6 +278,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\
# packagegroup-base-wifi contain everything needed to get WiFi working
# WEP/WPA connection needs to be supported out-of-box
#
+SUMMARY_packagegroup-base-wifi = "WiFi support"
RDEPENDS_packagegroup-base-wifi = "\
wireless-tools \
${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
@@ -282,6 +299,7 @@ RRECOMMENDS_packagegroup-base-wifi = "\
kernel-module-aes-generic \
kernel-module-aes"
+SUMMARY_packagegroup-base-3g = "Cellular data support"
RDEPENDS_packagegroup-base-3g = "\
ofono"
@@ -289,34 +307,41 @@ RRECOMMENDS_packagegroup-base-3g = "\
kernel-module-cdc-acm \
kernel-module-cdc-wdm"
+SUMMARY_packagegroup-base-smbfs = "SMB network filesystem support"
RRECOMMENDS_packagegroup-base-smbfs = "\
kernel-module-cifs \
kernel-module-smbfs"
+SUMMARY_packagegroup-base-cramfs = "cramfs filesystem support"
RRECOMMENDS_packagegroup-base-cramfs = "\
kernel-module-cramfs"
#
# packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package
#
+SUMMARY_packagegroup-base-nfs = "NFS network filesystem support"
RDEPENDS_packagegroup-base-nfs = "\
portmap"
RRECOMMENDS_packagegroup-base-nfs = "\
kernel-module-nfs "
+SUMMARY_packagegroup-base-zeroconf = "Zeroconf support"
RDEPENDS_packagegroup-base-zeroconf = "\
avahi-daemon"
+SUMMARY_packagegroup-base-ipv6 = "IPv6 support"
RDEPENDS_packagegroup-base-ipv6 = "\
"
RRECOMMENDS_packagegroup-base-ipv6 = "\
kernel-module-ipv6 "
+SUMMARY_packagegroup-base-serial = "Serial port support"
RDEPENDS_packagegroup-base-serial = "\
setserial \
lrzsz "
+SUMMARY_packagegroup-base-phone = "Cellular telephony (voice) support"
RDEPENDS_packagegroup-base-phone = "\
ofono"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index a2970d9..4b1208e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -2,7 +2,8 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image"
+SUMMARY = "Minimal boot requirements"
+DESCRIPTION = "The minimal set of packages required to boot the system"
LICENSE = "MIT"
DEPENDS = "virtual/kernel"
PR = "r9"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 7b9abdd..09414069 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2008 OpenedHand Ltd.
#
-DESCRIPTION = "NFS tasks for Poky"
+DESCRIPTION = "NFS package groups"
LICENSE = "MIT"
PR = "r1"
@@ -10,6 +10,7 @@ inherit packagegroup
PACKAGES = "${PN}-server"
+SUMMARY_${PN}-server = "NFS server"
RDEPENDS_${PN}-server = "\
nfs-utils \
nfs-utils-client \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index e944ec5..c79f092 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
+SUMMARY = "Software development tools"
LICENSE = "MIT"
PR = "r8"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index dd47d0c..7d71c0c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Dropbear SSH task for Poky"
+SUMMARY = "Dropbear SSH client/server"
LICENSE = "MIT"
PR = "r0"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 8a61b4f..f97b010 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenSSH SSH task for Poky"
+SUMMARY = "OpenSSH SSH client/server"
LICENSE = "MIT"
PR = "r0"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index 06903a4..a6da660 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2008 OpenedHand Ltd.
#
-DESCRIPTION = "Debug tools tasks for OE-Core"
+SUMMARY = "Debugging tools"
LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index bdf0d74..6a69363 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2008 OpenedHand Ltd.
#
-DESCRIPTION = "Profile tools tasks for OE-Core"
+SUMMARY = "Profiling tools"
LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 500f119..1aca97d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2008 OpenedHand Ltd.
#
-DESCRIPTION = "Test apps task for OE-Core"
+SUMMARY = "Testing tools/applications"
LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index fcae851..f8e527b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Host SDK package for cross canadian toolchain"
+SUMMARY = "Host SDK package for cross canadian toolchain"
PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
PR = "r0"
LICENSE = "MIT"
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 67e3f3c..de0a46d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -2,7 +2,8 @@
# Copyright (C) 2010 Intel Corporation
#
-DESCRIPTION = "Create Basic Image Tasks"
+SUMMARY = "Self-hosting"
+DESCRIPTION = "Packages required to run the build system"
PR = "r11"
LICENSE = "MIT"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 0e3998d..b8031e5 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -2,7 +2,8 @@
# Copyright (C) 2010 Intel Corporation
#
-DESCRIPTION = "Create Small Image Tasks"
+SUMMARY = "Linux Standard Base (LSB)"
+DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specification"
PR = "r9"
LICENSE = "MIT"
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 782df1f..64b572d 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
+SUMMARY = "GNOME Mobile And Embedded SDK (host tools)"
LICENSE = "MIT"
PR = "r12"
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index c560049..95067c4 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
+SUMMARY = "GNOME Mobile And Embedded SDK (target tools)"
LICENSE = "MIT"
PR = "r14"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 2c62820..08dd090 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
+SUMMARY = "Clutter package groups"
LICENSE = "MIT"
PR = "r4"
@@ -13,6 +13,7 @@ PACKAGES = "\
${PN}-core \
"
+SUMMARY_${PN}-core = "Clutter graphics library"
RDEPENDS_${PN}-core = "\
clutter-1.8 \
clutter-gst-1.8 \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index df22cd5..6d92a38 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "gkt+ over directfb without x11"
+SUMMARY = "GTK+ over DirectFB without X11"
PR = "r0"
LICENSE = "MIT"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index 1f17f01..75574c1 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -1,4 +1,5 @@
-DESCRIPTION = "Tasks for core X11 applications"
+SUMMARY = "Basic X11 session"
+DESCRIPTION = "Packages required to set up a basic working X11 session"
LICENSE = "MIT"
PR = "r0"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 7099c70..3704521 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -2,7 +2,6 @@
# Copyright (C) 2011 Intel Corporation
#
-DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
PR = "r36"
@@ -20,15 +19,18 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
# elsa, xserver-nodm-init
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+SUMMARY = "X11 display server and basic utilities"
RDEPENDS_${PN} = "\
${PN}-xserver \
${PN}-utils \
"
+SUMMARY_${PN}-xserver = "X11 display server"
RDEPENDS_${PN}-xserver = "\
${XSERVER} \
"
+SUMMARY_${PN}-utils = "X11 basic utilities and init"
RDEPENDS_${PN}-utils = "\
${VIRTUAL-RUNTIME_xserver_common} \
${VIRTUAL-RUNTIME_graphical_init_manager} \
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index d59cb4b..623a48f 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2010 Intel Corporation. All rights reserved
#
-DESCRIPTION = "Qt Tasks for Poky"
+DESCRIPTION = "Qt package groups"
LICENSE = "MIT"
PR = "r3"
@@ -12,4 +12,5 @@ PACKAGES = "${PN}-demoapps"
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
+SUMMARY_${PN}-demoapps = "Qt demo applications"
RDEPENDS_${PN}-demoapps = "${QTDEMOS}"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index de8341b..74ae7dd 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "QT4 Embedded base Image Feed"
+SUMMARY = "Qt for Embedded Linux (Qt without X11)"
PR = "r1"
LICENSE = "MIT"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index ebd2df1..b3b84e2 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2007-2008 OpenedHand Ltd.
#
-DESCRIPTION = "Sato Tasks for Poky"
+SUMMARY = "Sato desktop"
LICENSE = "MIT"
PR = "r32"
@@ -21,6 +21,7 @@ RDEPENDS_${PN} = "\
NETWORK_MANAGER ?= "connman-gnome"
NETWORK_MANAGER_libc-uclibc = ""
+SUMMARY_${PN}-base = "Sato desktop - base packages"
RDEPENDS_${PN}-base = "\
matchbox-desktop \
matchbox-session-sato \
@@ -44,6 +45,7 @@ FILEMANAGER_mips ?= ""
WEB ?= ""
#WEB = "web-webkit"
+SUMMARY_${PN}-apps = "Sato desktop - applications"
RDEPENDS_${PN}-apps = "\
gthumb \
leafpad \
@@ -55,6 +57,7 @@ RDEPENDS_${PN}-apps = "\
${WEB} \
"
+SUMMARY_${PN}-games = "Sato desktop - games"
RDEPENDS_${PN}-games = "\
oh-puzzles \
"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 25/28] packagegroup-core-basic: tidy up
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (23 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 24/28] packagegroup-*: set reasonable SUMMARY/DESCRIPTION Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 26/28] packagegroup-core-lsb: rework Paul Eggleton
` (7 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
* Remove packagegroup-core-basic-rpm - we already have a mechanism for
ensuring that packaging tools are installed on the target if desired;
we don't need a package group to bring them in as well (especially if
packagegroup-core-basic is used with other packaging systems).
* Remove the poorly-named packagegroup-core-base-utils: we already get
busybox via packagegroup-core-boot.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroups/packagegroup-core-basic.bb | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index b2489fe..4e4bcf5 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -10,34 +10,26 @@ inherit packagegroup
PACKAGES = "\
packagegroup-core-basic \
- packagegroup-core-base-utils \
packagegroup-core-basic-libs \
packagegroup-core-basic-utils \
packagegroup-core-basic-extended \
packagegroup-core-dev-utils \
packagegroup-core-multiuser \
packagegroup-core-initscripts \
- packagegroup-core-rpm \
packagegroup-core-sys-services \
"
RDEPENDS_packagegroup-core-basic = "\
- packagegroup-core-base-utils \
packagegroup-core-basic-libs \
packagegroup-core-basic-utils \
packagegroup-core-basic-extended \
packagegroup-core-dev-utils \
packagegroup-core-multiuser \
packagegroup-core-initscripts \
- packagegroup-core-rpm \
packagegroup-core-sys-services \
"
-RDEPENDS_packagegroup-core-base-utils = "\
- busybox \
- "
-
RDEPENDS_packagegroup-core-basic-libs = "\
glib-2.0 \
"
@@ -106,12 +98,6 @@ RDEPENDS_packagegroup-core-multiuser = "\
sudo \
"
-RDEPENDS_packagegroup-core-rpm = "\
- beecrypt \
- rpm \
- zypper \
- "
-
RDEPENDS_packagegroup-core-sys-services = "\
at \
bzip2 \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 26/28] packagegroup-core-lsb: rework
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (24 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 25/28] packagegroup-core-basic: tidy up Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 27/28] core-image-basic: tidy up Paul Eggleton
` (6 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Create package groups covering the Core, Desktop, Runtime Languages
sections of the LSB specification 4.1. Most of the packages were just
moved around or copied in from packagegroup-core-basic (which is
currently included in LSB images anyway) with the eventual aim of
having the LSB package groups be completely independent as well as
following the specification as closely as possible.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroups/packagegroup-core-lsb.bb | 110 ++++++++++++++------
1 file changed, 77 insertions(+), 33 deletions(-)
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index b8031e5..707ccc1 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -13,43 +13,39 @@ PACKAGES = "\
packagegroup-core-lsb \
packagegroup-core-sys-extended \
packagegroup-core-db \
- packagegroup-core-misc \
packagegroup-core-perl \
packagegroup-core-python \
packagegroup-core-tcl \
- packagegroup-core-lsb-perl-add \
- packagegroup-core-lsb-python-add \
- packagegroup-core-lsb-graphic-add \
+ packagegroup-core-lsb-misc \
+ packagegroup-core-lsb-core \
+ packagegroup-core-lsb-perl \
+ packagegroup-core-lsb-python \
+ packagegroup-core-lsb-desktop \
packagegroup-core-lsb-runtime-add \
- packagegroup-core-lsb-command-add \
"
RDEPENDS_packagegroup-core-lsb = "\
packagegroup-core-sys-extended \
packagegroup-core-db \
- packagegroup-core-misc \
packagegroup-core-perl \
packagegroup-core-python \
packagegroup-core-tcl \
- packagegroup-core-lsb-perl-add \
- packagegroup-core-lsb-python-add \
- packagegroup-core-lsb-graphic-add \
+ packagegroup-core-lsb-misc \
+ packagegroup-core-lsb-core \
+ packagegroup-core-lsb-perl \
+ packagegroup-core-lsb-python \
+ packagegroup-core-lsb-desktop \
packagegroup-core-lsb-runtime-add \
- packagegroup-core-lsb-command-add \
"
+
RDEPENDS_packagegroup-core-sys-extended = "\
- binutils \
- binutils-symlinks \
- chkconfig \
curl \
dhcp-client \
- diffutils \
gamin \
hdparm \
libaio \
- libxml2 \
lrzsz \
lzo \
mc \
@@ -67,7 +63,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\
which \
xinetd \
zip \
- lsbinitscripts \
"
RDEPENDS_packagegroup-core-db = "\
@@ -97,48 +92,98 @@ RDEPENDS_packagegroup-core-tcl = "\
tcl \
"
-RDEPENDS_packagegroup-core-misc = "\
- elfutils \
+# Miscellaneous packages required by LSB (or LSB tests)
+RDEPENDS_packagegroup-core-lsb-misc = "\
+ chkconfig \
gettext \
gettext-runtime \
groff \
- lsb \
+ lsbinitscripts \
lsbsetup \
lsbtest \
lsof \
- man \
- man-pages \
- ncurses \
strace \
libusb1 \
usbutils \
- zlib \
+ rpm \
"
-RDEPENDS_packagegroup-core-lsb-command-add = "\
- localedef \
+SUMMARY_packagegroup-core-lsb-core = "LSB Core"
+DESCRIPTION_packagegroup-core-lsb-core = "Packages required to support commands/libraries \
+ specified in the LSB Core specification"
+RDEPENDS_packagegroup-core-lsb-core = "\
+ at \
+ bash \
+ bc \
+ binutils \
+ binutils-symlinks \
+ coreutils \
+ cpio \
+ cronie \
+ cups \
+ diffutils \
+ ed \
+ eglibc-utils \
+ elfutils \
+ file \
+ findutils \
fontconfig-utils \
+ foomatic-filters \
+ gawk \
+ ghostscript \
+ grep \
+ gzip \
+ localedef \
+ lsb \
+ m4 \
mailx \
+ make \
+ man \
+ man-pages \
+ mktemp \
msmtp \
- chkconfig \
+ patch \
+ pax \
+ procps \
+ psmisc \
+ sed \
+ shadow \
+ tar \
+ time \
+ util-linux \
xdg-utils \
- foomatic-filters \
- cups \
- ghostscript \
+ \
+ eglibc \
+ libgcc \
+ libpam \
+ libxml2 \
+ ncurses \
+ zlib \
"
-RDEPENDS_packagegroup-core-lsb-perl-add = "\
+SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"
+DESCRIPTION_packagegroup-core-lsb-perl = "Packages required to support libraries \
+ specified in the LSB Runtime languages specification (Perl parts)"
+RDEPENDS_packagegroup-core-lsb-perl = "\
+ perl \
perl-modules \
perl-misc \
perl-pod \
"
-RDEPENDS_packagegroup-core-lsb-python-add = "\
+SUMMARY_packagegroup-core-lsb-python = "LSB Runtime Languages (Python)"
+DESCRIPTION_packagegroup-core-lsb-python = "Packages required to support libraries \
+ specified in the LSB Runtime languages specification (Python parts)"
+RDEPENDS_packagegroup-core-lsb-python = "\
+ python \
python-modules \
python-misc \
"
-RDEPENDS_packagegroup-core-lsb-graphic-add = "\
+SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop"
+DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \
+ specified in the LSB Desktop specification"
+RDEPENDS_packagegroup-core-lsb-desktop = "\
libqtcore4 \
libqtgui4 \
libqtsql4 \
@@ -181,7 +226,6 @@ RDEPENDS_packagegroup-core-lsb-runtime-add = "\
eglibc-localedata-posix \
eglibc-extra-nss \
eglibc-pcprofile \
- eglibc-utils \
"
PTH = "pth"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 27/28] core-image-basic: tidy up
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (25 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 26/28] packagegroup-core-lsb: rework Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:30 ` [PATCH 28/28] packagegroup-*: add RPROVIDES for backwards compatibility Paul Eggleton
` (5 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Set a more appropriate DESCRIPTION and remove commented-out line.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-extended/images/core-image-basic.bb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 06f15a8..091f57d 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "A foundational basic image without support for X that can be \
-reasonably used for customization."
+DESCRIPTION = "A console-only image with more full-featured Linux system \
+functionality installed."
IMAGE_FEATURES += "splash ssh-server-openssh"
@@ -8,6 +8,4 @@ IMAGE_INSTALL = "\
packagegroup-core-basic \
"
-# ${CORE_IMAGE_BASE_INSTALL}
-
inherit core-image
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* [PATCH 28/28] packagegroup-*: add RPROVIDES for backwards compatibility
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (26 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 27/28] core-image-basic: tidy up Paul Eggleton
@ 2012-09-03 10:30 ` Paul Eggleton
2012-09-03 10:39 ` [PATCH 00/28] Package group fixes Paul Eggleton
` (4 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:30 UTC (permalink / raw)
To: openembedded-core
Allow references to the old task packages to continue to work. This does
not add RPROVIDES for everything, just those packages that are likely to
have been referred to.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../packagegroups/packagegroup-base.bb | 9 +++++++++
.../packagegroups/packagegroup-core-boot.bb | 3 +++
.../packagegroups/packagegroup-core-nfs.bb | 3 +++
.../packagegroups/packagegroup-core-sdk.bb | 3 +++
.../packagegroup-core-ssh-dropbear.bb | 3 +++
.../packagegroups/packagegroup-core-ssh-openssh.bb | 3 +++
.../packagegroup-core-standalone-sdk-target.bb | 3 +++
.../packagegroups/packagegroup-core-tools-debug.bb | 3 +++
.../packagegroup-core-tools-profile.bb | 3 +++
.../packagegroup-core-tools-testapps.bb | 3 +++
.../packagegroups/packagegroup-cross-canadian.bb | 3 +++
.../packagegroups/packagegroup-core-basic.bb | 7 +++++++
.../packagegroups/packagegroup-core-lsb.bb | 1 +
.../packagegroups/packagegroup-core-sdk-gmae.bb | 3 +++
...packagegroup-core-standalone-gmae-sdk-target.bb | 3 +++
.../packagegroups/packagegroup-core-clutter.bb | 3 +++
.../packagegroup-core-gtk-directfb.bb | 3 +++
.../packagegroups/packagegroup-core-x11-base.bb | 3 +++
.../packagegroups/packagegroup-core-qt.bb | 3 +++
.../packagegroups/packagegroup-core-qt4e.bb | 3 +++
.../packagegroups/packagegroup-core-x11-sato.bb | 3 +++
21 files changed, 71 insertions(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index f151591..2178308 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -114,6 +114,15 @@ python __anonymous () {
if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
d.setVar("ADD_3G", "packagegroup-base-3g")
+
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ packages.remove("packagegroup-distro-base")
+ packages.remove("packagegroup-machine-base")
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-base", "task-base"))
+ d.appendVar("RPROVIDES_packagegroup-distro-base", "task-distro-base")
+ d.appendVar("RPROVIDES_packagegroup-machine-base", "task-machine-base")
}
#
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 4b1208e..d29dc2b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -18,6 +18,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-boot"
+
# Distro can override the following VIRTUAL-RUNTIME providers:
VIRTUAL-RUNTIME_dev_manager ?= "udev"
VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 09414069..03f9c12 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -10,6 +10,9 @@ inherit packagegroup
PACKAGES = "${PN}-server"
+# For backwards compatibility after rename
+RPROVIDES_${PN}-server = "task-core-nfs-server"
+
SUMMARY_${PN}-server = "NFS server"
RDEPENDS_${PN}-server = "\
nfs-utils \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index c79f092..f05e099 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -10,6 +10,9 @@ inherit packagegroup
#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
+# For backwards compatibility after rename
+RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
+
RDEPENDS_packagegroup-core-sdk = "\
autoconf \
automake \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 7d71c0c..7fa06e9 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -4,4 +4,7 @@ PR = "r0"
inherit packagegroup
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-ssh-dropbear"
+
RDEPENDS_${PN} = "dropbear"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index f97b010..3221e8b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -4,4 +4,7 @@ PR = "r0"
inherit packagegroup
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-ssh-openssh"
+
RDEPENDS_${PN} = "openssh"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 078e7dd..b7b5a29 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -6,6 +6,9 @@ inherit packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-standalone-sdk-target"
+
RDEPENDS_${PN} = "\
libgcc \
libgcc-dev \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index a6da660..6687b32 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -11,6 +11,9 @@ PR = "r1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-debug"
+
MTRACE = ""
MTRACE_libc-glibc = "libc-mtrace"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 6a69363..931984e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -9,6 +9,9 @@ inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-profile"
+
RRECOMMENDS_${PN} = "\
perf \
trace-cmd \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 1aca97d..9720e5a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -9,6 +9,9 @@ inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-testapps"
+
# kexec-tools doesn't work on Mips
KEXECTOOLS ?= "kexec"
KEXECTOOLS_mips ?= ""
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index f8e527b..cb2fb1a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -7,6 +7,9 @@ inherit cross-canadian packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+
RDEPENDS_${PN} = "\
binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index 4e4bcf5..30b66c5 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -19,6 +19,13 @@ PACKAGES = "\
packagegroup-core-sys-services \
"
+python __anonymous () {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
+}
+
RDEPENDS_packagegroup-core-basic = "\
packagegroup-core-basic-libs \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 707ccc1..120326f 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -25,6 +25,7 @@ PACKAGES = "\
"
+RPROVIDES_packagegroup-core-lsb = "task-core-lsb"
RDEPENDS_packagegroup-core-lsb = "\
packagegroup-core-sys-extended \
packagegroup-core-db \
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 64b572d..e959c5b 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -12,6 +12,9 @@ require packagegroup-sdk-gmae.inc
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-sdk-gmae"
+
RDEPENDS_${PN} = "\
packagegroup-core-sdk \
libglade-dev \
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 95067c4..69c5340 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -12,6 +12,9 @@ require packagegroup-sdk-gmae.inc
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"
+
RDEPENDS_${PN} = "\
packagegroup-core-standalone-sdk-target \
libglade-dev \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 08dd090..37e9a87 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -13,6 +13,9 @@ PACKAGES = "\
${PN}-core \
"
+# For backwards compatibility after rename
+RPROVIDES_${PN}-core = "task-core-clutter-core"
+
SUMMARY_${PN}-core = "Clutter graphics library"
RDEPENDS_${PN}-core = "\
clutter-1.8 \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 6d92a38..d6c2985 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -4,6 +4,9 @@ LICENSE = "MIT"
inherit packagegroup
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-gtk-directfb-base"
+
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
RDEPENDS_${PN} = " \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index 75574c1..ebae741 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -5,6 +5,9 @@ PR = "r0"
inherit packagegroup
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
+
RDEPENDS_${PN} = "\
packagegroup-core-x11-xserver \
packagegroup-core-x11-utils \
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 623a48f..ed13354 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -10,6 +10,9 @@ inherit packagegroup
PACKAGES = "${PN}-demoapps"
+# For backwards compatibility after rename
+RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
+
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
SUMMARY_${PN}-demoapps = "Qt demo applications"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 74ae7dd..042efb8 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -4,6 +4,9 @@ LICENSE = "MIT"
inherit packagegroup
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-qt4e-base"
+
TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
RDEPENDS_${PN} = " \
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index b3b84e2..5d781ae 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -12,6 +12,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-x11-sato"
+
RDEPENDS_${PN} = "\
${PN}-base \
${PN}-apps \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 00/28] Package group fixes
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (27 preceding siblings ...)
2012-09-03 10:30 ` [PATCH 28/28] packagegroup-*: add RPROVIDES for backwards compatibility Paul Eggleton
@ 2012-09-03 10:39 ` Paul Eggleton
2012-09-03 16:26 ` Koen Kooi
` (3 subsequent siblings)
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 10:39 UTC (permalink / raw)
To: openembedded-core
On Monday 03 September 2012 11:30:20 Paul Eggleton wrote:
> This rather large set of changes renames "task" to "packagegroup" and
> attempts to clean up a number of package group related issues [1]. It
> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> core-lsb and core-basic recipes even further, but unfortunately I ran
> out of time for this cycle.
>
> [1] http://www.openembedded.org/wiki/OE-Core_Task_Rework
Also, here's a script useful for renaming task to packagegroup in other
layers:
https://gist.github.com/3608439
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/28] Package group fixes
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (28 preceding siblings ...)
2012-09-03 10:39 ` [PATCH 00/28] Package group fixes Paul Eggleton
@ 2012-09-03 16:26 ` Koen Kooi
2012-09-03 16:35 ` Paul Eggleton
2012-09-04 9:46 ` Paul Eggleton
` (2 subsequent siblings)
32 siblings, 1 reply; 49+ messages in thread
From: Koen Kooi @ 2012-09-03 16:26 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
Op 3 sep. 2012, om 12:30 heeft Paul Eggleton <paul.eggleton@linux.intel.com> het volgende geschreven:
> This rather large set of changes renames "task" to "packagegroup" and
> attempts to clean up a number of package group related issues [1]. It
> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> core-lsb and core-basic recipes even further, but unfortunately I ran
> out of time for this cycle.
Instead of replying to a ton of patches, I'll reply to the cover letter :)
Missing PR bumps
>
> [1] http://www.openembedded.org/wiki/OE-Core_Task_Rework
>
>
> The following changes since commit c6da6b648328377ba3590fd38cb12dad26a46a13:
>
> crosstap: new script (2012-09-02 05:47:43 -0700)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib paule/task-rework
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/task-rework
>
> Paul Eggleton (28):
> classes/core-image: remove SSHSERVER_IMAGE_FEATURES
> classes/core-image: remove *_IMAGE_FEATURES variables
> classes/core-image: remove erroneous nfs-server comment
> Rename task to packagegroup
> packagegroup-base: remove some useless items
> classes/packagegroup: Use package group nomenclature
> packagegroup-core-nfs: remove broken glibc-utils reference
> classes/packagegroup: add ability to disable complementary packages
> packagegroup-*: change to inherit from packagegroup.bbclass
> packagegroup-core-x11: move out Sato applications
> core-image-core: rename to core-image-x11
> packagegroup-core-x11*: adjust X11 package groups
> packagegroup-qt4e: tidy up and rename
> packagegroup-core-gtk-directfb: remove superfluous -base package
> packagegroup-base: remove openswan from packagegroup-base-ipsec
> packagegroup-core-gtk-directfb: remove dropbear
> classes/packagegroup: disable superfluous tasks
> packagegroup-*: drop LIC_FILES_CHKSUM
> packagegroup-core-clutter: remove empty -apps/-tests tasks
> packagegroup-core-qt: rename -demos to -demoapps
> packagegroup-core-console: remove
> connman: add runtime dependency on dbus
> ofono: add runtime dependency on dbus
> packagegroup-*: set reasonable SUMMARY/DESCRIPTION
> packagegroup-core-basic: tidy up
> packagegroup-core-lsb: rework
> core-image-basic: tidy up
> packagegroup-*: add RPROVIDES for backwards compatibility
>
> meta/classes/archiver.bbclass | 4 +-
> meta/classes/core-image.bbclass | 53 ++-
> meta/classes/image.bbclass | 4 +
> meta/classes/insane.bbclass | 2 +-
> meta/classes/package.bbclass | 2 +-
> meta/classes/packagegroup.bbclass | 44 +++
> meta/classes/populate_sdk_base.bbclass | 4 +-
> meta/classes/task.bbclass | 32 +-
> meta/conf/bitbake.conf | 4 +-
> meta/recipes-bsp/qemu-config/qemu-config.bb | 2 +-
> meta/recipes-connectivity/connman/connman.inc | 3 +-
> meta/recipes-connectivity/ofono/ofono.inc | 2 +
> meta/recipes-connectivity/ofono/ofono_git.bb | 2 +-
> meta/recipes-core/images/build-appliance-image.bb | 4 +-
> meta/recipes-core/images/core-image-base.bb | 2 +-
> meta/recipes-core/images/core-image-core.bb | 8 -
> meta/recipes-core/images/core-image-minimal.bb | 2 +-
> meta/recipes-core/meta/meta-toolchain-gmae.bb | 2 +-
> .../nativesdk-packagegroup-sdk-host.bb} | 10 +-
> .../packagegroups/packagegroup-base.bb | 356 +++++++++++++++++++
> .../packagegroup-core-boot.bb} | 24 +-
> .../packagegroups/packagegroup-core-nfs.bb | 20 ++
> .../packagegroup-core-sdk.bb} | 24 +-
> .../packagegroup-core-ssh-dropbear.bb | 10 +
> .../packagegroups/packagegroup-core-ssh-openssh.bb | 10 +
> .../packagegroup-core-standalone-sdk-target.bb} | 10 +-
> .../packagegroup-core-tools-debug.bb} | 13 +-
> .../packagegroup-core-tools-profile.bb} | 13 +-
> .../packagegroup-core-tools-testapps.bb} | 13 +-
> .../packagegroup-cross-canadian.bb} | 14 +-
> .../packagegroup-self-hosted.bb} | 43 ++-
> meta/recipes-core/tasks/task-base.bb | 359 --------------------
> meta/recipes-core/tasks/task-core-console.bb | 28 --
> meta/recipes-core/tasks/task-core-nfs.bb | 28 --
> meta/recipes-core/tasks/task-core-ssh-dropbear.bb | 17 -
> meta/recipes-core/tasks/task-core-ssh-openssh.bb | 17 -
> meta/recipes-extended/images/core-image-basic.bb | 12 +-
> meta/recipes-extended/images/core-image-lsb-dev.bb | 6 +-
> meta/recipes-extended/images/core-image-lsb-sdk.bb | 6 +-
> meta/recipes-extended/images/core-image-lsb.bb | 6 +-
> .../libzypp/libzypp/config-release.patch | 4 +-
> .../packagegroup-core-basic.bb} | 88 ++---
> .../packagegroup-core-lsb.bb} | 172 ++++++----
> .../packagegroups/packagegroup-core-sdk-gmae.bb | 22 ++
> ...packagegroup-core-standalone-gmae-sdk-target.bb | 22 ++
> .../packagegroup-sdk-gmae.inc} | 0
> meta/recipes-gnome/tasks/task-core-sdk-gmae.bb | 21 --
> .../tasks/task-core-standalone-gmae-sdk-target.bb | 21 --
> meta/recipes-graphics/images/core-image-clutter.bb | 7 +-
> .../images/core-image-gtk-directfb.bb | 10 +-
> meta/recipes-graphics/images/core-image-x11.bb | 7 +
> .../packagegroups/packagegroup-core-clutter.bb | 24 ++
> .../packagegroup-core-gtk-directfb.bb} | 15 +-
> .../packagegroups/packagegroup-core-x11-base.bb | 20 ++
> .../packagegroups/packagegroup-core-x11.bb} | 40 +--
> meta/recipes-graphics/tasks/task-core-clutter.bb | 37 --
> meta/recipes-qt/images/qt4e-demo-image.bb | 10 +-
> meta/recipes-qt/meta/meta-toolchain-qte.bb | 4 +-
> .../nativesdk-packagegroup-qte-toolchain-host.bb} | 3 +-
> .../packagegroups/packagegroup-core-qt.bb | 19 ++
> .../packagegroup-core-qt4e.bb} | 16 +-
> .../packagegroup-qte-toolchain-target.bb} | 8 +-
> meta/recipes-qt/tasks/task-core-qt.bb | 22 --
> meta/recipes-sato/images/core-image-sato-dev.bb | 6 +-
> meta/recipes-sato/images/core-image-sato-sdk.bb | 10 +-
> meta/recipes-sato/images/core-image-sato.bb | 4 +-
> .../packagegroups/packagegroup-core-x11-sato.bb | 66 ++++
> meta/recipes-sato/tasks/task-core-x11-sato.bb | 42 ---
> meta/recipes-sato/tasks/task-core-x11.bb | 68 ----
> scripts/contrib/documentation-audit.sh | 2 +-
> 70 files changed, 943 insertions(+), 1062 deletions(-)
> create mode 100644 meta/classes/packagegroup.bbclass
> delete mode 100644 meta/recipes-core/images/core-image-core.bb
> rename meta/recipes-core/{tasks/nativesdk-task-sdk-host.bb => packagegroups/nativesdk-packagegroup-sdk-host.bb} (60%)
> create mode 100644 meta/recipes-core/packagegroups/packagegroup-base.bb
> rename meta/recipes-core/{tasks/task-core-boot.bb => packagegroups/packagegroup-core-boot.bb} (72%)
> create mode 100644 meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
> rename meta/recipes-core/{tasks/task-core-sdk.bb => packagegroups/packagegroup-core-sdk.bb} (78%)
> create mode 100644 meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
> create mode 100644 meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
> rename meta/recipes-core/{tasks/task-core-standalone-sdk-target.bb => packagegroups/packagegroup-core-standalone-sdk-target.bb} (47%)
> rename meta/recipes-core/{tasks/task-core-tools-debug.bb => packagegroups/packagegroup-core-tools-debug.bb} (48%)
> rename meta/recipes-core/{tasks/task-core-tools-profile.bb => packagegroups/packagegroup-core-tools-profile.bb} (81%)
> rename meta/recipes-core/{tasks/task-core-tools-testapps.bb => packagegroups/packagegroup-core-tools-testapps.bb} (66%)
> rename meta/recipes-core/{tasks/task-cross-canadian.bb => packagegroups/packagegroup-cross-canadian.bb} (42%)
> rename meta/recipes-core/{tasks/task-self-hosted.bb => packagegroups/packagegroup-self-hosted.bb} (77%)
> delete mode 100644 meta/recipes-core/tasks/task-base.bb
> delete mode 100644 meta/recipes-core/tasks/task-core-console.bb
> delete mode 100644 meta/recipes-core/tasks/task-core-nfs.bb
> delete mode 100644 meta/recipes-core/tasks/task-core-ssh-dropbear.bb
> delete mode 100644 meta/recipes-core/tasks/task-core-ssh-openssh.bb
> rename meta/recipes-extended/{tasks/task-core-basic.bb => packagegroups/packagegroup-core-basic.bb} (40%)
> rename meta/recipes-extended/{tasks/task-core-lsb.bb => packagegroups/packagegroup-core-lsb.bb} (42%)
> create mode 100644 meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
> create mode 100644 meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
> rename meta/recipes-gnome/{tasks/task-sdk-gmae.inc => packagegroups/packagegroup-sdk-gmae.inc} (100%)
> delete mode 100644 meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
> delete mode 100644 meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
> create mode 100644 meta/recipes-graphics/images/core-image-x11.bb
> create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
> rename meta/recipes-graphics/{tasks/task-core-gtk-directfb.bb => packagegroups/packagegroup-core-gtk-directfb.bb} (44%)
> create mode 100644 meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
> rename meta/{recipes-sato/tasks/task-core-x11-mini.bb => recipes-graphics/packagegroups/packagegroup-core-x11.bb} (47%)
> delete mode 100644 meta/recipes-graphics/tasks/task-core-clutter.bb
> rename meta/recipes-qt/{tasks/nativesdk-task-qte-toolchain-host.bb => packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb} (60%)
> create mode 100644 meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
> rename meta/recipes-qt/{tasks/task-qt4e.bb => packagegroups/packagegroup-core-qt4e.bb} (78%)
> rename meta/recipes-qt/{tasks/task-qte-toolchain-target.bb => packagegroups/packagegroup-qte-toolchain-target.bb} (78%)
> delete mode 100644 meta/recipes-qt/tasks/task-core-qt.bb
> create mode 100644 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> delete mode 100644 meta/recipes-sato/tasks/task-core-x11-sato.bb
> delete mode 100644 meta/recipes-sato/tasks/task-core-x11.bb
>
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/28] Package group fixes
2012-09-03 16:26 ` Koen Kooi
@ 2012-09-03 16:35 ` Paul Eggleton
2012-09-04 8:38 ` Koen Kooi
0 siblings, 1 reply; 49+ messages in thread
From: Paul Eggleton @ 2012-09-03 16:35 UTC (permalink / raw)
To: Koen Kooi; +Cc: openembedded-core
On Monday 03 September 2012 18:26:14 Koen Kooi wrote:
> Op 3 sep. 2012, om 12:30 heeft Paul Eggleton <paul.eggleton@linux.intel.com>
het volgende geschreven:
> > This rather large set of changes renames "task" to "packagegroup" and
> > attempts to clean up a number of package group related issues [1]. It
> > doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> > core-lsb and core-basic recipes even further, but unfortunately I ran
> > out of time for this cycle.
>
> Instead of replying to a ton of patches, I'll reply to the cover letter :)
>
> Missing PR bumps
Why would you need a PR bump when renaming the entire recipe?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 00/28] Package group fixes
2012-09-03 16:35 ` Paul Eggleton
@ 2012-09-04 8:38 ` Koen Kooi
2012-09-04 8:45 ` Paul Eggleton
0 siblings, 1 reply; 49+ messages in thread
From: Koen Kooi @ 2012-09-04 8:38 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
Op 3 sep. 2012, om 18:35 heeft Paul Eggleton <paul.eggleton@linux.intel.com> het volgende geschreven:
> On Monday 03 September 2012 18:26:14 Koen Kooi wrote:
>> Op 3 sep. 2012, om 12:30 heeft Paul Eggleton <paul.eggleton@linux.intel.com>
> het volgende geschreven:
>>> This rather large set of changes renames "task" to "packagegroup" and
>>> attempts to clean up a number of package group related issues [1]. It
>>> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
>>> core-lsb and core-basic recipes even further, but unfortunately I ran
>>> out of time for this cycle.
>>
>> Instead of replying to a ton of patches, I'll reply to the cover letter :)
>>
>> Missing PR bumps
>
> Why would you need a PR bump when renaming the entire recipe?
Take 15/28 for example, it changes the output package and doens't do a PR bump.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 00/28] Package group fixes
2012-09-04 8:38 ` Koen Kooi
@ 2012-09-04 8:45 ` Paul Eggleton
0 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-04 8:45 UTC (permalink / raw)
To: Koen Kooi; +Cc: openembedded-core
On Tuesday 04 September 2012 10:38:03 Koen Kooi wrote:
> Op 3 sep. 2012, om 18:35 heeft Paul Eggleton <paul.eggleton@linux.intel.com>
het volgende geschreven:
> > On Monday 03 September 2012 18:26:14 Koen Kooi wrote:
> >> Op 3 sep. 2012, om 12:30 heeft Paul Eggleton
> >> <paul.eggleton@linux.intel.com>>
> > het volgende geschreven:
> >>> This rather large set of changes renames "task" to "packagegroup" and
> >>> attempts to clean up a number of package group related issues [1]. It
> >>> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> >>> core-lsb and core-basic recipes even further, but unfortunately I ran
> >>> out of time for this cycle.
> >>
> >> Instead of replying to a ton of patches, I'll reply to the cover letter
> >> :)
> >>
> >> Missing PR bumps
> >
> > Why would you need a PR bump when renaming the entire recipe?
>
> Take 15/28 for example, it changes the output package and doens't do a PR
> bump.
The changes are intended to be considered as a whole, in which case it is not
important.
Look, I can make the PR bumps if it makes you feel better - that's all it will
actually achieve however. Is this the only feedback you have on this series?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 00/28] Package group fixes
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (29 preceding siblings ...)
2012-09-03 16:26 ` Koen Kooi
@ 2012-09-04 9:46 ` Paul Eggleton
2012-09-04 12:36 ` Richard Purdie
2012-09-04 12:58 ` Martin Jansa
32 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-04 9:46 UTC (permalink / raw)
To: openembedded-core
On Monday 03 September 2012 11:30:20 Paul Eggleton wrote:
> This rather large set of changes renames "task" to "packagegroup" and
> attempts to clean up a number of package group related issues [1]. It
> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> core-lsb and core-basic recipes even further, but unfortunately I ran
> out of time for this cycle.
>
> [1] http://www.openembedded.org/wiki/OE-Core_Task_Rework
Branch re-pushed with (somewhat unnecessary) PR bumps.
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/28] Package group fixes
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (30 preceding siblings ...)
2012-09-04 9:46 ` Paul Eggleton
@ 2012-09-04 12:36 ` Richard Purdie
2012-09-04 12:58 ` Martin Jansa
32 siblings, 0 replies; 49+ messages in thread
From: Richard Purdie @ 2012-09-04 12:36 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On Mon, 2012-09-03 at 11:30 +0100, Paul Eggleton wrote:
> This rather large set of changes renames "task" to "packagegroup" and
> attempts to clean up a number of package group related issues [1]. It
> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> core-lsb and core-basic recipes even further, but unfortunately I ran
> out of time for this cycle.
>
> [1] http://www.openembedded.org/wiki/OE-Core_Task_Rework
>
>
> The following changes since commit c6da6b648328377ba3590fd38cb12dad26a46a13:
>
> crosstap: new script (2012-09-02 05:47:43 -0700)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib paule/task-rework
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/task-rework
This has needed doing for a long time, we're coming to the end of the
development part of this release cycle, there has been opportunity for
feedback previously, the patches are quite heavy to maintain and the
feedback on the series so far as been relatively minor. I've therefore
merged to master, thanks.
Any issues we run into can be taken as patches on top of these changes
(which is likely what they'd be anyway).
Cheers,
Richard
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/28] Package group fixes
2012-09-03 10:30 [PATCH 00/28] Package group fixes Paul Eggleton
` (31 preceding siblings ...)
2012-09-04 12:36 ` Richard Purdie
@ 2012-09-04 12:58 ` Martin Jansa
2012-09-04 13:09 ` Paul Eggleton
32 siblings, 1 reply; 49+ messages in thread
From: Martin Jansa @ 2012-09-04 12:58 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
On Mon, Sep 03, 2012 at 11:30:20AM +0100, Paul Eggleton wrote:
> This rather large set of changes renames "task" to "packagegroup" and
> attempts to clean up a number of package group related issues [1]. It
> doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> core-lsb and core-basic recipes even further, but unfortunately I ran
> out of time for this cycle.
>
> [1] http://www.openembedded.org/wiki/OE-Core_Task_Rework
It looks like this does not have any upgrade path from old task-*
recipes.
14:16:07 < JaMa> bluelightning: how do you ensure upgrade path on target from task-* recipes to packagegroup-*?
14:16:47 < JaMa> bluelightning: tasks are installed mostly by image recipe, so target will stay on task-* which won't be ever upgraded
14:21:34 < JaMa> ah, there are RPROVIDES at least in some renamed recipes
14:31:52 < bluelightning> JaMa: there's a RPROVIDES yes
14:47:57 < JaMa> bluelightning: and does RPROVIDES really work?
14:48:36 < JaMa> bluelightning: I've added it to all meta-oe/meta-smartphone/meta-webos task-* recipes including PR bump and nothing is upgraded on target
14:48:46 < bluelightning> JaMa: I'm not sure if it will help in that situation
14:48:57 < JaMa> bluelightning: I guess you have to add RREPLACES too
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/28] Package group fixes
2012-09-04 12:58 ` Martin Jansa
@ 2012-09-04 13:09 ` Paul Eggleton
0 siblings, 0 replies; 49+ messages in thread
From: Paul Eggleton @ 2012-09-04 13:09 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Tuesday 04 September 2012 14:58:10 Martin Jansa wrote:
> On Mon, Sep 03, 2012 at 11:30:20AM +0100, Paul Eggleton wrote:
> > This rather large set of changes renames "task" to "packagegroup" and
> > attempts to clean up a number of package group related issues [1]. It
> > doesn't go quite as far as I had hoped - I wanted to tidy up the base,
> > core-lsb and core-basic recipes even further, but unfortunately I ran
> > out of time for this cycle.
> >
> > [1] http://www.openembedded.org/wiki/OE-Core_Task_Rework
>
> It looks like this does not have any upgrade path from old task-*
> recipes.
You mean, the *packages* on an existing target; there is an upgrade path for
the recipes at build time via RPROVIDES.
I can send a patch to add the RREPLACES, but then the question is when can
they be removed in future? I don't particularly like the answer "never". If we
do have to enable supporting them in perpetuity I'd much rather they get added
to an inc file that can optionally be included at the distro level by those who
want to support upgrades from much older versions to a newer one.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 49+ messages in thread