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 <scott.murray@konsulko.com>
Change-Id: I4f82cc84d27687f228ed3b9587103edef9c150c0
(cherry picked from commit 8184e5d18b223be1bb9260383bf18469d770f843)

diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb
index 9af32ee..ac31ae3 100644 (file)
--- 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 910b55b..7902146 100644 (file)
--- 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 \