diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2020-05-12 20:58:56 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-05-18 10:30:03 +0000 |
| commit | dad22a2b3c3cced169c4790e8fe5d8cf2cc62ee2 (patch) | |
| tree | 72df19f3267cb0b45dfece356e4d4f5890e909b0 /meta-agl-distro | |
| parent | a954a264140745f6732695dcce9f84494504b758 (diff) | |
Rework test/debug image features and crosssdk image definitions
Changes include:
- The agl-test-wgt/agl-devel-wgt image features and the scheme of
appending to their FEATURE_PACKAGES definitions turned out to be
problematic with respect to resulting in unexpected extra packages
ending up in agl-image-{minimal,ivi}, etc., when building with
agl-demo configured (which is typical usage). To avoid this, the
FEATURE_PACKAGE definitions for the image features have been
replaced with tweaks to define COMPLEMENTARY_GLOBS for the features
to bring in the test/debug/coverage packages via that mechanism.
- The above removes the need to define the extra test/devel
packagegroups, and requires some minor tweaks to aglwgt.bbclass to
use a -debug package for the debug widget instead of -dbg, to avoid
collisions with the dbg-pkgs image feature. As well, the afb-test
package has been added as to RDEPENDS of all test widget packages,
since that seems sensible and avoids needing to explicitly adding
it elsewhere.
- Attempt to rework the various crosssdk image definitions to use a
layered set of .inc files to remove duplication and ensure that
additions to the SDK are declared once in the appropriate profile.
It is likely that a clean sheet implementation would have some
things coming from meta-agl-profile-graphical, so further rework
may be required/desired to continue cleaning things up.
Bug-AGL: SPEC-3300, SPEC-3375
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I942b61501beb41d037001b70a501f90b9a59c45d
Diffstat (limited to 'meta-agl-distro')
| -rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 639e35554..48386ed1d 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -171,6 +171,10 @@ PACKAGE_FEED_BASE_PATHS = "rpm" PACKAGE_FEED_ARCHS = "" #${PACKAGE_ARCHS}" +# Complementary package definitions for agl-test-wgt and agl-devel-wgt +# image features +COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test' +COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug' # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools # (revalidate after 2017-10-15, 2018-06-12: still required) |