diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-20 20:26:31 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-21 10:55:50 +0000 |
| commit | 2ad7351693b239e2b4d60eac91f29d36634c5c03 (patch) | |
| tree | 70a76170ffb2ddaba2ade337db534352d02f3feb /meta-agl-core | |
| parent | bb36d5831ba9897b44c9cff92fccd26a977e4b8a (diff) | |
Update to meta-qt6: remove references to qt5
Update files to match the update to qt6.
Bug-AGL: SPEC-5294
Change-Id: I9db4ca648cc781378c01fe1381bb90ad1c78481c
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30531
Diffstat (limited to 'meta-agl-core')
7 files changed, 6 insertions, 4 deletions
diff --git a/meta-agl-core/conf/layer.conf b/meta-agl-core/conf/layer.conf index 8047df519..6a0b20d97 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 = "scarthgap" 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 |