From d6a5a62109fd99ce8b3fa5692156d2c2aecc6fb7 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 12 May 2020 21:03:23 -0400 Subject: 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 Change-Id: I6b54af5f7c76965171282ed81dc8160c69a9441f --- recipes-platform/images/agl-demo-platform-crosssdk.bb | 11 +---------- recipes-platform/images/agl-demo-platform.inc | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) mode change 100755 => 100644 recipes-platform/images/agl-demo-platform-crosssdk.bb (limited to 'recipes-platform/images') diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb old mode 100755 new mode 100644 index ed3bcb76..cd31551b --- 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 203fcc07..f363e304 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 -- cgit 1.2.3-korg