From 61becb58b652e04f5d55e160755cd7fb99f66403 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 30 Mar 2020 15:08:58 -0400 Subject: Update distro_features_check usage Replace distro_features_check usage with features_check to work with dunfell, which has removed distro_features_check. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray Change-Id: I46ef0d0feaa5515dd664de4cc5a9691e2ebe109b --- .../recipes-platform/images/agl-image-graphical-qt5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-agl-profile-graphical-qt5/recipes-platform') diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc index ed1634fcc..cef3bf64e 100644 --- a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc +++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc @@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-minimal.inc IMAGE_FEATURES += "splash package-management ssh-server-dropbear" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "wayland" -- cgit 1.2.3-korg From 47ccf3570de3dd6e54beda92ecb037cc96b0cec1 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 2 Apr 2020 12:41:29 -0400 Subject: meta-agl-profile-graphical-qt5: remove Chromium specific bits from SDK The gn tool recipe is not usable on dunfell due to python2 dependencies, and the current AGL solution for web applications does not require building Chromium with the SDK, so remove the packages explicitly added for Chromium to cut down on the SDK size and build time. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray Change-Id: I1cb10fa919d331b231e6c393674be5e71c00edc0 --- .../images/agl-image-graphical-qt5-crosssdk.bb | 28 ---------------------- 1 file changed, 28 deletions(-) (limited to 'meta-agl-profile-graphical-qt5/recipes-platform') diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb index cfc465e62..a952fe2a1 100755 --- a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb +++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb @@ -18,34 +18,6 @@ inherit populate_sdk populate_sdk_qt5 # can failed (randomly). addtask do_populate_sdk after do_rootfs -# native tools to support Chromium build inside SDK (SPEC-942) -TOOLCHAIN_HOST_TASK += " \ - nativesdk-gn \ - nativesdk-ninja \ - nativesdk-gperf \ - nativesdk-zlib \ - nativesdk-xz \ - nativesdk-nspr-dev \ - nativesdk-nss-dev \ - nativesdk-lua \ - " - -# required dependencies for Chromium build inside SDK (SPEC-942) -TOOLCHAIN_TARGET_TASK += " \ - pciutils-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire-dev wireplumber-dev', '', d)} \ - cairo-dev \ - nss-dev \ - cups-dev \ - gconf-dev \ - libexif-dev \ - pango-dev \ - libdrm-dev \ - lua-dev \ - lua-staticdev \ - ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'ffmpeg-dev', '', d)} \ - " - # Add wayland-scanner to SDK (SPEC-945) # Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup # wayland-scanner is in nativesdk-wayland-dev ! -- cgit 1.2.3-korg