From 8320d5245677a79b78711bb5f00202be562f6817 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 13 Oct 2023 20:14:00 -0400 Subject: [PATCH] Add base demo images MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Some rework to add agl-ivi-demo-base and agl-ivi-demo-base-flutter images that have all of the required demo services and configuration, but not our demo UI applications. As part of this, move some of the conditional package inclusion logic out of the demo platform packagegroups into the image recipes to make the packagegroup contents stable, and add applaunchd to the IVI services packagegroup so it'll always get pulled in. Some of this may still get redone in the future per SPEC-4813. Bug-AGL: SPEC-4933 Change-Id: Ief4b7ef3f0720315cbdc579f62b1196c66e237cd Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29278 Reviewed-by: Lisandro P�rez Meyer Reviewed-by: Hiroyuki Ishii Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- .../images/agl-ivi-demo-base-flutter.bb | 9 +++++++ recipes-platform/images/agl-ivi-demo-base.bb | 23 ++++++++++++++++++ .../images/agl-ivi-demo-platform-flutter.bb | 28 +++++++++++----------- recipes-platform/images/agl-ivi-demo-platform.bb | 24 ++++++++++--------- .../packagegroup-agl-demo-platform-flutter.bb | 18 ++------------ .../packagegroup-agl-demo-platform.bb | 15 ------------ .../packagegroups/packagegroup-agl-ivi-services.bb | 2 ++ 7 files changed, 63 insertions(+), 56 deletions(-) create mode 100644 recipes-platform/images/agl-ivi-demo-base-flutter.bb create mode 100644 recipes-platform/images/agl-ivi-demo-base.bb diff --git a/recipes-platform/images/agl-ivi-demo-base-flutter.bb b/recipes-platform/images/agl-ivi-demo-base-flutter.bb new file mode 100644 index 000000000..70fd2c51d --- /dev/null +++ b/recipes-platform/images/agl-ivi-demo-base-flutter.bb @@ -0,0 +1,9 @@ +require agl-ivi-demo-base.bb + +DESCRIPTION = "AGL Flutter demo base image" + +IMAGE_INSTALL += " \ + packagegroup-agl-demo-platform-flutter \ + weston-ini-conf-flutter \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \ +" diff --git a/recipes-platform/images/agl-ivi-demo-base.bb b/recipes-platform/images/agl-ivi-demo-base.bb new file mode 100644 index 000000000..da8d2eece --- /dev/null +++ b/recipes-platform/images/agl-ivi-demo-base.bb @@ -0,0 +1,23 @@ +require agl-image-ivi.bb + +DESCRIPTION = "AGL demo base image" + +require agl-demo-features.inc +require agl-demo-container-guest-integration.inc + +AGL_DEVEL_INSTALL += "\ + packagegroup-agl-kuksa-val-databroker-devel \ + simple-can-simulator \ + unzip \ + mpc \ +" + +AGL_APPS_INSTALL = "" + +IMAGE_INSTALL += " \ + ${AGL_APPS_INSTALL} \ + ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \ +" + + + diff --git a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb index 9d67ee31e..dfebce0d7 100644 --- a/recipes-platform/images/agl-ivi-demo-platform-flutter.bb +++ b/recipes-platform/images/agl-ivi-demo-platform-flutter.bb @@ -1,21 +1,21 @@ -require agl-image-ivi.bb +require agl-ivi-demo-base-flutter.bb -DESCRIPTION = "AGL Flutter based Demo Platform image" +DESCRIPTION = "AGL Flutter Demo Platform image" -require agl-demo-features.inc -require agl-demo-container-guest-integration.inc - -# Add packages for demo platform (include demo apps) here - -AGL_DEVEL_INSTALL += "\ - packagegroup-agl-kuksa-val-databroker-devel \ - simple-can-simulator \ +AGL_APPS_INSTALL += " \ + flutter-homescreen \ + flutter-dashboard \ + flutter-hvac \ + ondemandnavi \ + settings \ + mediaplayer \ + messaging \ + phone \ + radio \ " IMAGE_INSTALL += " \ - packagegroup-agl-demo-platform-flutter \ - weston-ini-conf-flutter \ - ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \ + qtquickcontrols2-agl \ + qtquickcontrols2-agl-style \ " diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb index d860cd518..318bae46f 100644 --- a/recipes-platform/images/agl-ivi-demo-platform.bb +++ b/recipes-platform/images/agl-ivi-demo-platform.bb @@ -1,20 +1,22 @@ -require agl-image-ivi.bb +require agl-ivi-demo-base.bb -DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and demos." +DESCRIPTION = "AGL Qt Demo Platform image" -require agl-demo-features.inc -require agl-demo-container-guest-integration.inc - -# Add packages for demo platform (include demo apps) here - -AGL_DEVEL_INSTALL += "\ - packagegroup-agl-kuksa-val-databroker-devel \ - simple-can-simulator \ +AGL_APPS_INSTALL += " \ + dashboard \ + hvac \ + ondemandnavi \ + settings \ + mediaplayer \ + messaging \ + phone \ + radio \ + window-management-client-grpc \ + camera-gstreamer \ " IMAGE_INSTALL += " \ packagegroup-agl-demo-platform \ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "", "weston-terminal-conf", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "${AGL_DEVEL_INSTALL}" , "", d)} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb index 8e645445a..e01c315d6 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb @@ -16,24 +16,10 @@ RDEPENDS:${PN} += "\ packagegroup-agl-demo \ " -AGL_APPS = " \ - flutter-dashboard \ - flutter-hvac \ - ondemandnavi \ - settings \ - mediaplayer \ - messaging \ - phone \ - radio \ - " - RDEPENDS:${PN}:append = " \ agl-compositor \ flutter-auto \ - flutter-homescreen \ - qtquickcontrols2-agl \ - qtquickcontrols2-agl-style \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \ - ${AGL_APPS} \ + agl-flutter-env \ + applaunchd-template-agl-app-flutter \ psplash-portrait-config \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 6095f7103..cf8268d44 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -16,26 +16,11 @@ RDEPENDS:${PN} += "\ packagegroup-agl-demo \ " -AGL_APPS = " \ - dashboard \ - hvac \ - ondemandnavi \ - settings \ - mediaplayer \ - messaging \ - phone \ - radio \ - window-management-client-grpc \ - camera-gstreamer \ - " - RDEPENDS:${PN}:append = " \ weston-ini-conf-no-activate \ homescreen \ launcher \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ - ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \ - ${AGL_APPS} \ psplash-portrait-config \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb index b76942642..e4a4a9d0f 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb @@ -8,6 +8,8 @@ PACKAGES = "\ " RDEPENDS:${PN} += "\ + applaunchd \ + applaunchd-template-agl-app \ agl-service-hvac \ agl-service-audiomixer \ agl-service-radio \ -- 2.16.6