summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2024-09-27 01:50:58 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-10-09 14:03:15 +0000
commit9aaf29f1b8522d701b59d0da89ae6fb9e77b4792 (patch)
tree6d0ab694de8483efd2e604ca37c460d69e0f6c20
parent442f3951769dbbb0f9cc51252a8add78a6430141 (diff)
Rework meta-agl-ic-container to migrate from Qt5 to Qt6
This change is a starting point of Qt6 migration. That change layer config and feature config for this layer. Bug-AGL: SPEC-5162 Change-Id: I127a929cfc5cf311b0219c6fbfb050ed9332576f Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
-rw-r--r--meta-agl-ic-container/conf/layer.conf2
-rw-r--r--meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend1
-rw-r--r--templates/feature/agl-ic-container/50_bblayers.conf.inc4
-rw-r--r--templates/feature/agl-ic-container/README_feature_agl-ic-container.md16
4 files changed, 14 insertions, 9 deletions
diff --git a/meta-agl-ic-container/conf/layer.conf b/meta-agl-ic-container/conf/layer.conf
index 7b715454..178d6f74 100644
--- a/meta-agl-ic-container/conf/layer.conf
+++ b/meta-agl-ic-container/conf/layer.conf
@@ -21,4 +21,4 @@ BBFILES_DYNAMIC += " \
"
LAYERSERIES_COMPAT_aglcontainermc = "scarthgap"
-LAYERDEPENDS_aglcontainermc = "aglcore qt5-layer openembedded-layer virtualization-layer agl-drm-lease meta-pipewire"
+LAYERDEPENDS_aglcontainermc = "aglcore qt6-layer openembedded-layer virtualization-layer agl-drm-lease meta-pipewire"
diff --git a/meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend b/meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend
deleted file mode 100644
index 7f2e9aa3..00000000
--- a/meta-agl-ic-container/recipes-qt5/qt5/qtbase_git.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:append:aglcontainerivi = " sql-sqlite"
diff --git a/templates/feature/agl-ic-container/50_bblayers.conf.inc b/templates/feature/agl-ic-container/50_bblayers.conf.inc
index 119cacb7..313cf12a 100644
--- a/templates/feature/agl-ic-container/50_bblayers.conf.inc
+++ b/templates/feature/agl-ic-container/50_bblayers.conf.inc
@@ -2,8 +2,10 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
-AGL_META_QT5 = "${METADIR}/external/meta-qt5"
+AGL_META_QT5 = ""
+AGL_META_QT6 = "${METADIR}/external/meta-qt6"
BBLAYERS =+ " \
${METADIR}/meta-agl-devel/meta-agl-ic-container \
+ ${AGL_META_QT6} \
"
diff --git a/templates/feature/agl-ic-container/README_feature_agl-ic-container.md b/templates/feature/agl-ic-container/README_feature_agl-ic-container.md
index e5b5391c..632945e2 100644
--- a/templates/feature/agl-ic-container/README_feature_agl-ic-container.md
+++ b/templates/feature/agl-ic-container/README_feature_agl-ic-container.md
@@ -1,14 +1,18 @@
---
-description: Feature agl-lxc
-authors: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
+description: AGL Instrument Cluster Container Integration feature
+authors: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
---
-### Feature agl-lxc
+### Feature agl-ic-container
-*Description is missing - please complete file meta-agl-devel/templates/feature/agl-lxc/README_feature_agl-lxc.md*
+This feature realize to AGL container integration.
+That support dual system on a linux kernel using linux container technology.
-### Dependent features pulled by agl-lxc
+
+### Dependent features pulled by agl-ic-container
The following features are pulled:
-* agl-container
+* agl-drm-lease
+* agl-pipewire
+* agl-selinux