summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-01-04 16:31:16 -0500
committerScott Murray <scott.murray@konsulko.com>2021-01-12 15:37:11 +0000
commit161b988ccac63ce2c92acff0917e2ea811770c28 (patch)
tree349ec3d9b27b99a857acb2ac6908c4d354bbb45f
parent3ec6b8b20636befeb458c2118fc45b6aef66530f (diff)
Update weston-ini-conf package use
The rework of the weston-ini-conf recipe in meta-agl new means that there are separate weston-ini-conf and weston-ini-conf-landscape packages for portrait versus landscape mode, so update use in the demo image packagegroups to use the appropriate one explicitly. The previous dependency in packagegroup-agl-graphical-weston has been removed since weston-init now has a dependency on the new "weston-ini" runtime (i.e. explicit RPROVIDES) dependency. Note, however, that explicitly pulling weston-ini-conf or weston-ini-conf-landscape into images is recommended as opposed to relying on PREFERRED_RPROVIDER. Bug-AGL: SPEC-3745 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ia37d61c5684a06755d2761850394e5f887f14a4a
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc1
4 files changed, 3 insertions, 1 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
index 2ca89e4e9..612e26d45 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
@@ -34,6 +34,7 @@ AGL_APIS = " \
DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-preload", "cluster-dashboard-demo-config", "",d)}"
RDEPENDS_${PN}_append = " \
+ weston-ini-conf-landscape \
hmi-debug \
can-utils \
linux-firmware-ralink \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
index 751743b3c..acfb9e64d 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
@@ -28,5 +28,6 @@ AGL_APPS = " \
"
RDEPENDS_${PN}_append = " \
+ weston-ini-conf-landscape \
${AGL_APPS} \
"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 5682cb638..53d478c09 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -72,6 +72,7 @@ DEMO_PRELOAD_MAPS = "${@bb.utils.contains("PREFERRED_RPROVIDER_virtual/navigatio
DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " ${DEMO_PRELOAD_MAPS} ${DEMO_UNIT_CONF} poiapp-api-key", "",d)}"
RDEPENDS_${PN}_append = " \
+ weston-ini-conf \
qtquickcontrols2-agl \
qtquickcontrols2-agl-style \
${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip' , '', d)} \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
index d7d7be2a3..f68b2e21a 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
+++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc
@@ -1,5 +1,4 @@
RDEPENDS_${PN} += " \
- weston-ini-conf \
agl-compositor \
"
# appfw