From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:15:02 +0100 Subject: SPEC-3723: restructure meta-agl-demo All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller Signed-off-by: Scott Murray Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8 --- .../images/agl-cluster-demo-platform-crosssdk.bb | 27 ++++++++++++++++++++++ .../images/agl-cluster-demo-platform.bb | 14 +++++++++++ .../images/agl-cluster-demo-platform.inc | 3 +++ .../images/agl-cluster-demo-qtcompositor.bb | 15 ++++++++++++ .../images/agl-cluster-demo-qtcompositor.inc | 2 ++ .../images/agl-demo-platform-crosssdk.bb | 2 +- recipes-platform/images/agl-image-cluster-qt5.bb | 9 ++++++++ recipes-platform/images/agl-image-cluster-qt5.inc | 7 ++++++ recipes-platform/images/agl-image-cluster.bb | 9 ++++++++ recipes-platform/images/agl-image-cluster.inc | 7 ++++++ .../images/agl-image-graphical-html5.bb | 10 ++++++++ .../images/agl-image-graphical-html5.inc | 9 ++++++++ .../images/agl-image-graphical-qt5-crosssdk.bb | 18 +++++++++++++++ .../images/agl-image-graphical-qt5-crosssdk.inc | 14 +++++++++++ recipes-platform/images/agl-image-graphical-qt5.bb | 5 ++++ .../images/agl-image-graphical-qt5.inc | 1 + recipes-platform/images/agl-image-telematics.bb | 9 ++++++++ recipes-platform/images/agl-image-telematics.inc | 5 ++++ .../agl-telematics-demo-platform-crosssdk.bb | 21 +++++++++++++++++ .../images/agl-telematics-demo-platform.bb | 13 +++++++++++ .../images/agl-telematics-demo-platform.inc | 3 +++ 21 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb create mode 100644 recipes-platform/images/agl-cluster-demo-platform.bb create mode 100644 recipes-platform/images/agl-cluster-demo-platform.inc create mode 100644 recipes-platform/images/agl-cluster-demo-qtcompositor.bb create mode 100644 recipes-platform/images/agl-cluster-demo-qtcompositor.inc create mode 100644 recipes-platform/images/agl-image-cluster-qt5.bb create mode 100644 recipes-platform/images/agl-image-cluster-qt5.inc create mode 100644 recipes-platform/images/agl-image-cluster.bb create mode 100644 recipes-platform/images/agl-image-cluster.inc create mode 100644 recipes-platform/images/agl-image-graphical-html5.bb create mode 100644 recipes-platform/images/agl-image-graphical-html5.inc create mode 100755 recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb create mode 100644 recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc create mode 100644 recipes-platform/images/agl-image-graphical-qt5.bb create mode 100644 recipes-platform/images/agl-image-graphical-qt5.inc create mode 100644 recipes-platform/images/agl-image-telematics.bb create mode 100644 recipes-platform/images/agl-image-telematics.inc create mode 100644 recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb create mode 100644 recipes-platform/images/agl-telematics-demo-platform.bb create mode 100644 recipes-platform/images/agl-telematics-demo-platform.inc (limited to 'recipes-platform/images') diff --git a/recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb b/recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb new file mode 100644 index 00000000..6f8bf629 --- /dev/null +++ b/recipes-platform/images/agl-cluster-demo-platform-crosssdk.bb @@ -0,0 +1,27 @@ +SUMMARY = "Cross SDK of AGL Distribution for Cluster profile Demo" + +DESCRIPTION = "SDK image for AGL Distribution for Cluster profile Demo. \ +It includes the full meta-toolchain, plus developement headers and libraries \ +to form a standalone cross SDK." + +require agl-cluster-demo-platform.bb + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " dev-pkgs" +IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" + +inherit populate_sdk populate_sdk_qt5 + +# Task do_populate_sdk and do_rootfs can't be exec simultaneously. +# Both exec "createrepo" on the same directory, and so one of them +# can failed (randomly). +addtask do_populate_sdk after do_rootfs + +# Add wayland-scanner to SDK (SPEC-945) +# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup +# wayland-scanner is in nativesdk-wayland-dev ! +# option: add also nativesdk-qtwayland-tools +TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" + +TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb new file mode 100644 index 00000000..52d737b7 --- /dev/null +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "AGL Cluster Demo Platform image currently contains a simple cluster interface." + +require agl-cluster-demo-platform.inc + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " \ + " + +# add packages for cluster demo platform (include demo apps) here +IMAGE_INSTALL_append = " \ + packagegroup-agl-cluster-demo-platform \ + " + diff --git a/recipes-platform/images/agl-cluster-demo-platform.inc b/recipes-platform/images/agl-cluster-demo-platform.inc new file mode 100644 index 00000000..8745ca94 --- /dev/null +++ b/recipes-platform/images/agl-cluster-demo-platform.inc @@ -0,0 +1,3 @@ +# Base image +require recipes-platform/images/agl-image-cluster-qt5.inc + diff --git a/recipes-platform/images/agl-cluster-demo-qtcompositor.bb b/recipes-platform/images/agl-cluster-demo-qtcompositor.bb new file mode 100644 index 00000000..d6f32566 --- /dev/null +++ b/recipes-platform/images/agl-cluster-demo-qtcompositor.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "AGL Cluster Demo Qtwayland Compositor image currently contains a \ +simple cluster interface and some AGL service." + +require agl-cluster-demo-qtcompositor.inc + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " \ + " + +# add packages for cluster demo qtcompositor +IMAGE_INSTALL_append = " \ + packagegroup-agl-cluster-demo-qtcompositor \ + " + diff --git a/recipes-platform/images/agl-cluster-demo-qtcompositor.inc b/recipes-platform/images/agl-cluster-demo-qtcompositor.inc new file mode 100644 index 00000000..11c1ebce --- /dev/null +++ b/recipes-platform/images/agl-cluster-demo-qtcompositor.inc @@ -0,0 +1,2 @@ +# Base image +require recipes-platform/images/agl-image-cluster-qt5.inc diff --git a/recipes-platform/images/agl-demo-platform-crosssdk.bb b/recipes-platform/images/agl-demo-platform-crosssdk.bb index ff3e9dfd..d4b6c9dd 100644 --- a/recipes-platform/images/agl-demo-platform-crosssdk.bb +++ b/recipes-platform/images/agl-demo-platform-crosssdk.bb @@ -8,7 +8,7 @@ require agl-demo-platform.bb LICENSE = "MIT" -require recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc +require agl-image-graphical-qt5-crosssdk.inc inherit populate_sdk populate_sdk_qt5 diff --git a/recipes-platform/images/agl-image-cluster-qt5.bb b/recipes-platform/images/agl-image-cluster-qt5.bb new file mode 100644 index 00000000..244e2ba4 --- /dev/null +++ b/recipes-platform/images/agl-image-cluster-qt5.bb @@ -0,0 +1,9 @@ +SUMMARY = "A basic Wayland based cluster image with Qt5 support" + +require agl-image-cluster-qt5.inc + +LICENSE = "MIT" + +IMAGE_INSTALL_append = "\ + profile-cluster-qt5 \ + " diff --git a/recipes-platform/images/agl-image-cluster-qt5.inc b/recipes-platform/images/agl-image-cluster-qt5.inc new file mode 100644 index 00000000..93826aa4 --- /dev/null +++ b/recipes-platform/images/agl-image-cluster-qt5.inc @@ -0,0 +1,7 @@ +require recipes-platform/images/agl-image-boot.inc + +IMAGE_FEATURES += "splash package-management ssh-server-dropbear" + +inherit features_check + +REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/recipes-platform/images/agl-image-cluster.bb b/recipes-platform/images/agl-image-cluster.bb new file mode 100644 index 00000000..552d7a74 --- /dev/null +++ b/recipes-platform/images/agl-image-cluster.bb @@ -0,0 +1,9 @@ +SUMMARY = "A basic Wayland based cluster image" + +require agl-image-cluster.inc + +LICENSE = "MIT" + +IMAGE_INSTALL_append = "\ + profile-cluster \ + " diff --git a/recipes-platform/images/agl-image-cluster.inc b/recipes-platform/images/agl-image-cluster.inc new file mode 100644 index 00000000..93826aa4 --- /dev/null +++ b/recipes-platform/images/agl-image-cluster.inc @@ -0,0 +1,7 @@ +require recipes-platform/images/agl-image-boot.inc + +IMAGE_FEATURES += "splash package-management ssh-server-dropbear" + +inherit features_check + +REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/recipes-platform/images/agl-image-graphical-html5.bb b/recipes-platform/images/agl-image-graphical-html5.bb new file mode 100644 index 00000000..0ec6829e --- /dev/null +++ b/recipes-platform/images/agl-image-graphical-html5.bb @@ -0,0 +1,10 @@ +SUMMARY = "An image containing all packages required to run web applications" + +require agl-image-graphical-html5.inc + +LICENSE = "MIT" + +IMAGE_INSTALL_append = "\ + packagegroup-agl-profile-graphical-html5 \ + " + diff --git a/recipes-platform/images/agl-image-graphical-html5.inc b/recipes-platform/images/agl-image-graphical-html5.inc new file mode 100644 index 00000000..e943b990 --- /dev/null +++ b/recipes-platform/images/agl-image-graphical-html5.inc @@ -0,0 +1,9 @@ +require recipes-platform/images/agl-image-minimal.inc + +IMAGE_FEATURES += "splash" + +IMAGE_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'ssh-server-dropbear' , '', d)}" + +inherit features_check + +REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb new file mode 100755 index 00000000..5147ea44 --- /dev/null +++ b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.bb @@ -0,0 +1,18 @@ +SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile" + +DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \ +It includes the full meta-toolchain, plus developement headers and libraries \ +to form a standalone cross SDK." + +require agl-image-graphical-qt5.bb + +LICENSE = "MIT" + +require agl-image-graphical-qt5-crosssdk.inc + +inherit populate_sdk populate_sdk_qt5 + +# Task do_populate_sdk and do_rootfs can't be exec simultaneously. +# Both exec "createrepo" on the same directory, and so one of them +# can failed (randomly). +addtask do_populate_sdk after do_rootfs diff --git a/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc new file mode 100644 index 00000000..f43bb07d --- /dev/null +++ b/recipes-platform/images/agl-image-graphical-qt5-crosssdk.inc @@ -0,0 +1,14 @@ +require recipes-platform/images/agl-image-minimal-crosssdk.inc + +TOOLCHAIN_TARGET_TASK += "libafb-helpers-qt-staticdev" + +# Add wayland-scanner to SDK (SPEC-945) +# Use TOOLCHAIN_HOST_TASK instead of adding to the packagegroup +# wayland-scanner is in nativesdk-wayland-dev ! +# option: add also nativesdk-qtwayland-tools +TOOLCHAIN_HOST_TASK_append = " nativesdk-wayland nativesdk-wayland-dev" + +TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " + +# Add qtwaylandscanner to the SDK +TOOLCHAIN_HOST_TASK_append = " nativesdk-qtwayland-tools " diff --git a/recipes-platform/images/agl-image-graphical-qt5.bb b/recipes-platform/images/agl-image-graphical-qt5.bb new file mode 100644 index 00000000..bcfd724f --- /dev/null +++ b/recipes-platform/images/agl-image-graphical-qt5.bb @@ -0,0 +1,5 @@ +SUMMARY = "A very basic Wayland image with a terminal" + +require agl-image-graphical-qt5.inc + +LICENSE = "MIT" diff --git a/recipes-platform/images/agl-image-graphical-qt5.inc b/recipes-platform/images/agl-image-graphical-qt5.inc new file mode 100644 index 00000000..114d06a0 --- /dev/null +++ b/recipes-platform/images/agl-image-graphical-qt5.inc @@ -0,0 +1 @@ +require recipes-platform/images/agl-image-weston.inc diff --git a/recipes-platform/images/agl-image-telematics.bb b/recipes-platform/images/agl-image-telematics.bb new file mode 100644 index 00000000..ad6ef988 --- /dev/null +++ b/recipes-platform/images/agl-image-telematics.bb @@ -0,0 +1,9 @@ +SUMMARY = "A basic telematics image" + +require agl-image-telematics.inc + +LICENSE = "MIT" + +IMAGE_INSTALL_append = "\ + profile-telematics \ + " diff --git a/recipes-platform/images/agl-image-telematics.inc b/recipes-platform/images/agl-image-telematics.inc new file mode 100644 index 00000000..3e951550 --- /dev/null +++ b/recipes-platform/images/agl-image-telematics.inc @@ -0,0 +1,5 @@ +require recipes-platform/images/agl-image-boot.inc + +inherit features_check + +REQUIRED_DISTRO_FEATURES = "3g" diff --git a/recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb b/recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb new file mode 100644 index 00000000..75b4f5ce --- /dev/null +++ b/recipes-platform/images/agl-telematics-demo-platform-crosssdk.bb @@ -0,0 +1,21 @@ +SUMMARY = "Cross SDK of AGL Distribution for telematics profile Demo" + +DESCRIPTION = "SDK image for AGL Distribution for Telematics profile Demo. \ +It includes the full meta-toolchain, plus developement headers and libraries \ +to form a standalone cross SDK." + +require agl-telematics-demo-platform.bb + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " dev-pkgs" +IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" + +inherit populate_sdk + +# Task do_populate_sdk and do_rootfs can't be exec simultaneously. +# Both exec "createrepo" on the same directory, and so one of them +# can failed (randomly). +addtask do_populate_sdk after do_rootfs + +TOOLCHAIN_HOST_TASK_append = " nativesdk-perl-modules " diff --git a/recipes-platform/images/agl-telematics-demo-platform.bb b/recipes-platform/images/agl-telematics-demo-platform.bb new file mode 100644 index 00000000..403f4b70 --- /dev/null +++ b/recipes-platform/images/agl-telematics-demo-platform.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "AGL Telematics Demo Platform image." + +require agl-telematics-demo-platform.inc + +LICENSE = "MIT" + +IMAGE_FEATURES_append = " \ + " + +IMAGE_INSTALL_append = " \ + packagegroup-agl-telematics-demo-platform \ + " + diff --git a/recipes-platform/images/agl-telematics-demo-platform.inc b/recipes-platform/images/agl-telematics-demo-platform.inc new file mode 100644 index 00000000..bd3a89ee --- /dev/null +++ b/recipes-platform/images/agl-telematics-demo-platform.inc @@ -0,0 +1,3 @@ +# Base image +require recipes-platform/images/agl-image-telematics.inc + -- cgit 1.2.3-korg