From 7e59879e8e9ed12b020f8ee11a6989b85eaa3173 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 4 Feb 2021 10:29:30 -0500 Subject: [PATCH] Update cluster demo weston configuration Tweak the cluster demo to move the weston-ini-conf-landscape dependency to the image recipe, where the use of the regular or inverted configuration is now based on whether the "agl-demo-preload" feature is set. This means the cluster demo images will now by default have no rotation, but still allows building images for the AGL demo setup with its inverted cluster display. Bug-AGL: SPEC-3791 Signed-off-by: Scott Murray Change-Id: I4f82cc84d27687f228ed3b9587103edef9c150c0 (cherry picked from commit 8184e5d18b223be1bb9260383bf18469d770f843) --- recipes-platform/images/agl-cluster-demo-platform.bb | 1 + recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb index 9af32ee42..ac31ae326 100644 --- a/recipes-platform/images/agl-cluster-demo-platform.bb +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -10,5 +10,6 @@ IMAGE_FEATURES_append = "" IMAGE_INSTALL_append = " \ packagegroup-agl-cluster-demo-platform \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-dashboard-demo-config", "", d)} \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "weston-ini-conf-landscape-inverted", "weston-ini-conf-landscape", d)} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb index 910b55bd8..7902146d5 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb @@ -32,7 +32,6 @@ AGL_APIS = " \ " RDEPENDS_${PN}_append = " \ - weston-ini-conf-landscape \ hmi-debug \ can-utils \ linux-firmware-ralink \ -- 2.16.6