diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2020-05-12 21:03:23 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-05-18 10:29:55 +0000 |
| commit | d6a5a62109fd99ce8b3fa5692156d2c2aecc6fb7 (patch) | |
| tree | 2bd9026d7f419c22c4feb656b00f9e4fd3a28ce0 /recipes-platform/images | |
| parent | 65b5d6484107ba1b97073d91b2d2733edac0ab79 (diff) | |
Update test/devel feature and crosssdk definitions
To match the update in meta-agl, rework to drop the agl-test-wgt and
agl-devel-wgt feature package additions and now unnecessary test/devel
packagegroups. They'll now be pulled in by the COMPLEMENTARY_GLOBS
definitions for those image features.
As well, to ensure that agl-demo-platform-crosssdk contains required
extra additions, use new .inc file from meta-agl-profile-graphical-qt5
in the SDK definition.
Bug-AGL: SPEC-3300, SPEC-3375
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I6b54af5f7c76965171282ed81dc8160c69a9441f
Diffstat (limited to 'recipes-platform/images')
| -rw-r--r--[-rwxr-xr-x] | recipes-platform/images/agl-demo-platform-crosssdk.bb | 11 | ||||
| -rw-r--r-- | recipes-platform/images/agl-demo-platform.inc | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb index ed3bcb76e..cd31551be 100755..100644 --- a/recipes-platform/images/agl-demo-platform-crosssdk.bb +++ b/recipes-platform/images/agl-demo-platform-crosssdk.bb @@ -8,8 +8,7 @@ require agl-demo-platform.bb LICENSE = "MIT" -IMAGE_FEATURES_append = " dev-pkgs" -IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" +require recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc inherit populate_sdk populate_sdk_qt5 @@ -18,14 +17,6 @@ inherit populate_sdk populate_sdk_qt5 # can failed (randomly). addtask do_populate_sdk after do_rootfs -# Add wayland-scanner to SDK (SPEC-945) -# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup -# wayland-scanner is in nativesdk-wayland-dev ! -# option: add also nativesdk-qtwayland-tools -TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" - -TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " - # Add mosquitto to support building the telematics demo application. # This is currently required for CI, as it uses agl-demo-platform-crosssdk # to build everything. An agenda item has been tabled for the May 2019 F2F diff --git a/recipes-platform/images/agl-demo-platform.inc b/recipes-platform/images/agl-demo-platform.inc index 203fcc077..f363e304f 100644 --- a/recipes-platform/images/agl-demo-platform.inc +++ b/recipes-platform/images/agl-demo-platform.inc @@ -1,3 +1,2 @@ # Base image -require recipes-platform/images/agl-image-ivi.inc - +require agl-image-ivi.inc |