Merge pull request #826 from YoeDistro/kraj/master

Update layers
YoeDistro · Aug 18, 2023 · 9f85c9f · 9f85c9f
2 parents c485429 + 15293ec
commit 9f85c9f
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 40 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,10 +14,6 @@
 	path = sources/meta-freescale-3rdparty
 	url = https://github.com/YoeDistro/meta-freescale-3rdparty
 	branch = master
-[submodule "sources/meta-qt5"]
-	path = sources/meta-qt5
-	url = https://github.com/YoeDistro/meta-qt5
-	branch = master
 [submodule "sources/meta-intel"]
 	path = sources/meta-intel
 	url = https://github.com/YoeDistro/meta-intel

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,16 +48,21 @@ and this project adheres to
 - Wrap more bitbake commands in container e.g. bitbake-getvar
 - Enable i2c and disable rpi boot logo for rpi4-64
 - Add needed host SDK bits for QT6 to yoe-kiosk-image
+- Define SRCREV_FORMAT for recipes with multiple git SRC_URIs
+- Upgrade to glibc 2.38
+- Upgrade openSSL to 3.1.2
 
 ### Added
 
 - Added recipes
-  - webkitgtk3, libnvme, python3-telnetlib3, mstpd
+  - webkitgtk3, libnvme, python3-telnetlib3, mstpd, bolt
+    python3-types-psutil, python3-types-setuptools, qad
 - Add script to generate kernel CVE_STATUS entries for linux-yocto
 - Add packageconfig to support colored logs in journald
 - Add DOCKER_PORTS variable in setenv to forward ports between docker and host
 - Add GCP fetcher to list of supported protocols
 - Add yocto sstate mirror as default backup for public sstate feeds
+- Add MESON_TARGET to meson class which can be defined in recipes
 
 ### Removed
 

diff --git a/conf/projects/beaglebone/layers.conf b/conf/projects/beaglebone/layers.conf
@@ -11,7 +11,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/imx8mm-ddr4-evk/layers.conf b/conf/projects/imx8mm-ddr4-evk/layers.conf
@@ -8,7 +8,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/nezha-d1/layers.conf b/conf/projects/nezha-d1/layers.conf
@@ -8,7 +8,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/odroid-c4/layers.conf b/conf/projects/odroid-c4/layers.conf
@@ -9,7 +9,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/rockpi-4b/layers.conf b/conf/projects/rockpi-4b/layers.conf
@@ -10,7 +10,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/unleashed/layers.conf b/conf/projects/unleashed/layers.conf
@@ -8,7 +8,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/unmatched/layers.conf b/conf/projects/unmatched/layers.conf
@@ -9,7 +9,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/var-dart-imx6ul/layers.conf b/conf/projects/var-dart-imx6ul/layers.conf
@@ -9,7 +9,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/conf/projects/visionfive/layers.conf b/conf/projects/visionfive/layers.conf
@@ -8,7 +8,7 @@ BBLAYERS = "\
     \
     ${TOPDIR}/sources/meta-clang \
     ${TOPDIR}/sources/meta-elm-binary \
-    ${TOPDIR}/sources/meta-qt5 \
+    ${TOPDIR}/sources/meta-qt6 \
     \
     ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
     ${TOPDIR}/sources/meta-openembedded/meta-gnome \

diff --git a/sources/meta-arm b/sources/meta-arm
diff --git a/sources/meta-openembedded b/sources/meta-openembedded
diff --git a/sources/meta-qt5 b/sources/meta-qt5
diff --git a/sources/meta-qt6 b/sources/meta-qt6
diff --git a/sources/meta-variscite-bsp b/sources/meta-variscite-bsp
diff --git a/sources/meta-yoe/recipes-core/images/yoe-qt5-image.bb b/sources/meta-yoe/recipes-core/images/yoe-qt5-image.bb
@@ -11,3 +11,8 @@ export IMAGE_BASENAME = "yoe-qt5-image"
 
 # ptest needs a lot of memory
 QB_MEM = "-m 1024"
+
+python() {
+    if 'qt5-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
+        raise bb.parse.SkipRecipe('Requires meta-qt5 in bblayers.conf')
+}
diff --git a/sources/meta-yoe/recipes-graphics/lvgl/lvgl-demo-fb.bb b/sources/meta-yoe/recipes-graphics/lvgl/lvgl-demo-fb.bb
diff --git a/sources/poky b/sources/poky