diff options
13 files changed, 11 insertions, 155 deletions
diff --git a/docs/profiles.md b/docs/profiles.md deleted file mode 100644 index 5d0f89d4f..000000000 --- a/docs/profiles.md +++ /dev/null @@ -1,146 +0,0 @@ -# AGL Profiles - -The AGL Profiles cover the different use-cases that the AGL platform serves.\ -This ranges from minimal systems without display, telematic systems, HUD, IVI, ADAS and more.\ -Common to all of them is the use of the AGL APIs (agl-service-*). - -All systems have the 'core' profile in common.\ -This small set of libraries and binaries is the essential set including the AGL APIs that every AGL system needs.\ -All other profiles reuse the 'core' profile. - -The other profiles and their dependencies are currently: - -* agl-profile-core - * agl-profile-telematics - * agl-profile-hud - * agl-profile-graphical - * agl-profile-graphical-html5 - * agl-profile-graphical-qt5 - * agl-demo-platform - -## agl-profile-core - -This profile contains the following images: - -* agl-image-boot - * agl-image-minimal - * agl-image-minimal-crosssdk - -### agl-image-boot - -This image is only meant to boot the target device and provide network, package-management and a shell.\ -All other functionality needs to be installed at runtime through 'dnf' using the provided package feeds and package-groups (e.g. dnf install profile-graphical-qt5) - -### agl-image-minimal - -This is the smallest image that includes all (non-graphical) AGL APIs. - -### agl-image-minimal-crosssdk - -This is the SDK for systems without display including the AGL APIs. - -## agl-profile-telematics - -N.N. - -## agl-profile-hud - -N.N. - -## agl-profile-graphical - -This profile contains a basic graphical system with wayland/weston.\ -It is used as a base for the more targeted profiles: - -* agl-profile-graphical-html5 -* agl-profile-graphical-qt5 - -Part of this layer are the following images: - -* agl-image-weston - -### agl-image-weston - -Pure wayland + weston image but with all AGL service APIs. - -## agl-profile-graphical-html5 - -This profile contains all components to build a html5 / web-based system and should be used as a base layer for further projects.\ -All AGL APIs are included. - -## agl-profile-graphical-qt5 - -This profile is used as base for all projects that build on qt5 like the agl-demo-platform.\ -Part of this layer are the ffollowing images: - -* agl-image-graphical-qt5 -* agl-image-graphical-qt5-crosssdk\ - (THIS IS THE SDK TARGET WE AIM TO USE FOR AGL-DEMO-PLATFORM IN THE END) - -All AGL APIs are included. - -### agl-image-graphical-qt5 - -Image with wayland/weston and the qt5 packages installed. - -### agl-image-graphical-qt5-crosssdk - -SDK based on agl-image-graphical-qt5 suitable for development under qt5. - -## agl-demo-platform - -This layer builds on-top of agl-profile-graphical-qt5 and builds the full AGL demonstrator image.\ -It hosts these images: - -* agl-demo-platform -* agl-demo-platform-crosssdk -* agl-demo-platform-qa - -TLDR: - -```tree -meta-agl/meta-agl-profile-core/recipes-platform -|-- images -| |-- agl-image-boot.bb -| |-- agl-image-boot.inc -| |-- agl-image-minimal-crosssdk.bb -| |-- agl-image-minimal-qa.bb -| |-- agl-image-minimal.bb -| `-- agl-image-minimal.inc -`-- packagegroups - |-- packagegroup-agl-core-boot.bb - |-- packagegroup-agl-core-connectivity.bb - |-- packagegroup-agl-core-multimedia.bb - |-- packagegroup-agl-core-navigation.bb - |-- packagegroup-agl-core-os-commonlibs.bb - |-- packagegroup-agl-core-security.bb - |-- packagegroup-agl-core-services.bb - |-- packagegroup-agl-image-boot.bb - `-- packagegroup-agl-image-minimal.bb - - meta-agl/meta-agl-profile-graphical/recipes-platform -|-- images -| |-- agl-image-weston.bb -| `-- agl-image-weston.inc -`-- packagegroups - |-- packagegroup-agl-graphical-services.bb - `-- packagegroup-agl-image-weston.bb - - meta-agl/meta-agl-profile-graphical-html5/recipes-platform -|-- images -| |-- agl-demo-platform-html5-crosssdk.bb -| |-- agl-demo-platform-html5.bb -| `-- agl-demo-platform-html5.inc -`-- packagegroups - `-- packagegroup-agl-demo-platform-html5.bb - - meta-agl/meta-agl-profile-graphical-qt5/recipes-platform -|-- images -| |-- agl-image-graphical-qt5-crosssdk.bb -| |-- agl-image-graphical-qt5.bb -| `-- agl-image-graphical-qt5.inc -`-- packagegroups - |-- packagegroup-agl-demo-qt-examples.bb - |-- packagegroup-agl-profile-graphical-qt5.bb - `-- packagegroup-qt5-toolchain-target.bbappend -``` diff --git a/meta-agl-core/conf/layer.conf b/meta-agl-core/conf/layer.conf index 40cc4a30e..8d5d956fb 100644 --- a/meta-agl-core/conf/layer.conf +++ b/meta-agl-core/conf/layer.conf @@ -16,9 +16,11 @@ BBFILES_DYNAMIC += " \ selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bb \ selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bbappend \ \ - qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bb \ - qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bbappend \ " +# migrate to meta-qt6 +# qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bb \ +# qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bbappend \ +# LAYERSERIES_COMPAT_aglcore = "walnascar" LAYERDEPENDS_aglcore = "core" diff --git a/meta-agl-core/conf/templates/base/bblayers.conf.sample b/meta-agl-core/conf/templates/base/bblayers.conf.sample index c6a37a0b0..228c7dbda 100644 --- a/meta-agl-core/conf/templates/base/bblayers.conf.sample +++ b/meta-agl-core/conf/templates/base/bblayers.conf.sample @@ -42,7 +42,7 @@ AGL_META_FILESYSTEMS ?= "" AGL_META_MULTIMEDIA ?= "" AGL_META_VIRTUALIZATION ?= "" AGL_META_CLANG ?= "" -AGL_META_QT5 ?= "" +AGL_META_QT6 ?= "" AGL_OTHER_DEPENDENCY_LAYERS = " \ ${AGL_META_NETWORKING} \ @@ -51,7 +51,7 @@ AGL_OTHER_DEPENDENCY_LAYERS = " \ ${AGL_META_MULTIMEDIA} \ ${AGL_META_VIRTUALIZATION} \ ${AGL_META_CLANG} \ - ${AGL_META_QT5} \ + ${AGL_META_QT6} \ " #################### diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_%.bbappend b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_%.bbappend index aab944c2f..aab944c2f 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_%.bbappend diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_aglcore.inc index 581f5de99..581f5de99 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc +++ b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_aglcore.inc diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch index ba8a991ed..ba8a991ed 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch +++ b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtlocation_%.bbappend b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_%.bbappend index a0d80075a..a0d80075a 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtlocation_%.bbappend +++ b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_%.bbappend diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtlocation_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_aglcore.inc index 60867aef0..60867aef0 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtlocation_aglcore.inc +++ b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_aglcore.inc diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0001-dbc2val-add-installation-mechanism.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0001-dbc2val-add-installation-mechanism.patch index 6a9c1ba14..4081aec55 100644 --- a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0001-dbc2val-add-installation-mechanism.patch +++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0001-dbc2val-add-installation-mechanism.patch @@ -6,7 +6,7 @@ Subject: [PATCH 1/4] dbc2val: add installation mechanism Add setup.py and setup.cfg to allow installing the dbcfeederlib module and dbcfeeder.py in a way suitable for packaging. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch index 91a309240..10fced2f6 100644 --- a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch +++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0002-dbc2val-usability-improvements.patch @@ -16,7 +16,7 @@ Changes: in the current working directory. That likely works for upstream test scenarios, but prevents running on a target. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0003-dbc2val-fix-token-file-configuration-option.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0003-dbc2val-fix-token-file-configuration-option.patch index faf94e0af..e2ba24d1a 100644 --- a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0003-dbc2val-fix-token-file-configuration-option.patch +++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0003-dbc2val-fix-token-file-configuration-option.patch @@ -7,7 +7,7 @@ The client library changed the token option name to 'token_or_tokenfile', update things to match so that token location can be configured again for dbcfeeder.py. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0004-Enable-val2dbc-for-sensor-values.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0004-Enable-val2dbc-for-sensor-values.patch index e45fb4cf5..1c343a269 100644 --- a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0004-Enable-val2dbc-for-sensor-values.patch +++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-can-provider/0004-Enable-val2dbc-for-sensor-values.patch @@ -6,7 +6,7 @@ Subject: [PATCH 4/4] Enable val2dbc for sensor values Rework to allow val2dbc mode to write out sensor values in addition to actuator target values. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- diff --git a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch index 3f5527384..6d4502e70 100644 --- a/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch +++ b/meta-agl-kuksa-val/recipes-connectivity/kuksa-val/kuksa-client/0001-kuksa-client-Update-cmd2-completer-usage.patch @@ -6,7 +6,7 @@ Subject: [PATCH 1/2] kuksa-client: Update cmd2 completer usage Update cmd2 usage to avoid using internal methods and fix breakage with newer versions of the cmd2 module. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- |