From c411b52fb2f502b8c976f005c14abae791e22e92 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 30 Mar 2020 14:52:40 -0400 Subject: Declare layer compatibility for dunfell For the upgrade to YP dunfell/3.1 we need to update the layer compatibility. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray Change-Id: Ieb1ac9ef1f48f077c9cd312c4ac295ae1cc062b0 --- meta-agl-profile-graphical-qt5/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-agl-profile-graphical-qt5') 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" -- cgit 1.2.3-korg 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-cluster-qt5.inc | 2 +- meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc | 2 +- .../recipes-platform/images/agl-image-graphical-qt5.inc | 2 +- meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc | 2 +- .../recipes-platform/images/agl-image-telematics.inc | 2 +- meta-security/recipes-security/security-manager/security-manager.inc | 2 +- meta-security/recipes-security/smacknet/smacknet.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-agl-profile-graphical-qt5') diff --git a/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc b/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc index 9f9f530f9..93826aa46 100644 --- a/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc +++ b/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc @@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-boot.inc IMAGE_FEATURES += "splash package-management ssh-server-dropbear" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc b/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc index 9f9f530f9..93826aa46 100644 --- a/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc +++ b/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc @@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-boot.inc IMAGE_FEATURES += "splash package-management ssh-server-dropbear" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "wayland" 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" diff --git a/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc index ed1634fcc..cef3bf64e 100644 --- a/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc +++ b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.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" diff --git a/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc b/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc index b8c228cdc..3e951550e 100644 --- a/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc +++ b/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc @@ -1,5 +1,5 @@ require recipes-platform/images/agl-image-boot.inc -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "3g" diff --git a/meta-security/recipes-security/security-manager/security-manager.inc b/meta-security/recipes-security/security-manager/security-manager.inc index fdc5083e6..e1d1f4011 100644 --- a/meta-security/recipes-security/security-manager/security-manager.inc +++ b/meta-security/recipes-security/security-manager/security-manager.inc @@ -36,7 +36,7 @@ EXTRA_OECMAKE = " \ inherit systemd SYSTEMD_SERVICE_${PN} = "security-manager.service" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES += "smack" # The upstream source code contains the Tizen-specific policy configuration files. diff --git a/meta-security/recipes-security/smacknet/smacknet.bb b/meta-security/recipes-security/smacknet/smacknet.bb index 553456aee..250cdb132 100644 --- a/meta-security/recipes-security/smacknet/smacknet.bb +++ b/meta-security/recipes-security/smacknet/smacknet.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}" inherit systemd -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "smack" #netlabel configuration service -- 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') 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