summaryrefslogtreecommitdiffstats
path: root/meta-agl-profile-graphical-qt5
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-04-27 17:32:16 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-04-27 17:32:33 +0200
commitb16f1f6b8bdd7b0cef4aad3a6714798b66d8b0a5 (patch)
tree61c5df69bed7810e988b06434e8efc7ab9071acd /meta-agl-profile-graphical-qt5
parent40213738bcd84fc542cda3ec6336b0e394b28dcc (diff)
parentc24cdffea9dfa3904fc3ea9da0bc80e5515b078d (diff)
Merge branch 'next'
* next: Temporary workarounds for h3ulcb and bbe [RCAR] use omx-user-module as libomxil provider meta-agl-bsp: dra7xx-evm/beaglebone updates for dunfell meta-agl-bsp: remove obsolete linux-fslc-imx bbappend meta-agl-profile-graphical-qt5: remove Chromium specific bits from SDK meta-agl-profile-graphical: disable memfd usage in weston meta-agl-bsp: update raspberrypi configuration for dunfell meta-agl-{bsp,distro}: update kernel configuration for dunfell meta-agl-profile-core: update psplash for dunfell meta-agl-profile-core: update systemd for dunfell meta-app-framework: set DISTRO_FEATURES_NATIVE meta-agl-profile-core: update bluez5 for dunfell meta-agl-profile-graphical: update weston for dunfell meta-agl-profile-graphical: update wayland-ivi-extension for dunfell meta-agl-profile-graphical: update wayland for dunfell meta-agl-profile-core: update pulseaudio for dunfell meta-security: update to audit 2.8.5 Update distro_features_check usage meta-agl-bsp: remove vboxguestdrivers recipe Declare layer compatibility for dunfell Change-Id: I879ad3040ed6f2fca3f21d189ccce7f1614013b5 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-profile-graphical-qt5')
-rw-r--r--meta-agl-profile-graphical-qt5/conf/layer.conf2
-rwxr-xr-xmeta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb28
-rw-r--r--meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc2
3 files changed, 2 insertions, 30 deletions
diff --git a/meta-agl-profile-graphical-qt5/conf/layer.conf b/meta-agl-profile-graphical-qt5/conf/layer.conf
index 1ae215c32..ef39630d8 100644
--- a/meta-agl-profile-graphical-qt5/conf/layer.conf
+++ b/meta-agl-profile-graphical-qt5/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "aglprofilegraphicalqt5"
BBFILE_PATTERN_aglprofilegraphicalqt5 = "^${LAYERDIR}/"
BBFILE_PRIORITY_aglprofilegraphicalqt5 = "70"
-LAYERSERIES_COMPAT_aglprofilegraphicalqt5 = "zeus"
+LAYERSERIES_COMPAT_aglprofilegraphicalqt5 = "dunfell"
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 !
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"