Merge pull request #816 from YoeDistro/kraj/master

Update layers, Fix ptest runs on qemu
YoeDistro · Aug 4, 2023 · 64a52ba · 64a52ba
2 parents 6b358de + 37afa95
commit 64a52ba
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 22 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -43,7 +43,7 @@ jobs:
       - name: Build Images
         run: |
           /bin/bash -c ". ./envsetup.sh visionfive2 && bitbake yoe-installer-image"
-          /bin/bash -c ". ./envsetup.sh rpi4-64     && bitbake yoe-installer-image yoe-qt5-image"
+          /bin/bash -c ". ./envsetup.sh rpi4-64     && bitbake yoe-installer-image yoe-kiosk-image"
       - name: ver
         run: echo "ver=$(printf ' - ' && cat sources/meta-yoe/conf/distro/yoe.inc | grep 'DISTRO_CODENAME =' | cut -d' ' -f 3 )" >> $GITHUB_OUTPUT
         id: ver

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,7 +49,7 @@ jobs:
           /bin/bash -c "sed -i -e 's/SDK_UPDATE_URL.*$//' conf/site.conf"
       - name: Build Image
         run: |
-          /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-qt5-image"
+          /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-kiosk-image"
       - name: Test Image
         run: |
           export DISPLAY=":0"

diff --git a/.gitmodules b/.gitmodules
@@ -65,4 +65,4 @@
 [submodule "sources/meta-qt6"]
 	path = sources/meta-qt6
 	url = https://github.com/YoeDistro/meta-qt6
-	branch = 6.5
+	branch = yoe/6.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,9 +14,25 @@ and this project adheres to
 - Implement new project detection logic in envsetup
 - Upgrade Simple IoT to v0.12.2
 - Fix dependencies for yoe-kiosk-browser
+- Convert CVE_CHECK_IGNORE to CVE_STATUS in meta-openembedded
+- Fix cross builds for python3-pyaudio
+- Enable wayland/x11/opengl configs based corresponding distro features in mesa-pvr
+- Move libadwaita to core layer
+- Move gcr3 to meta-oe
+- Upgrade systemd to 253.7
+- Upgrade FSL graphics stack to 6.4.11.p1.2 BSP release
+- Use libgpiod 1.x for VAR-SOM based projects e.g. var-som-mx8
+- Switch Qemu based projects to use QT6 instead of QT5
 
 ### Added
 
+- Added recipes
+  - webkitgtk3, libnvme, python3-telnetlib3, mstpd
+
+### Removed
+
+- Remove version-going-backwards from build QA errors
+
 ## [2023.07] - 2023-07-31
 
 ### Changed

diff --git a/conf/projects/qemucommon/config.conf b/conf/projects/qemucommon/config.conf
@@ -25,6 +25,8 @@ QEMU_USE_KVM = "1"
 #TEST_RUNQEMUPARAMS = "publicvnc"
 # needed for running ptests automatically
 PACKAGE_FEED_URIS ?= ""
+# Needed for ptest runs
+EXTRA_IMAGE_FEATURES += "debug-tweaks"
 
 IMG_VERSION = "0.0.1"
 #####################################################################

diff --git a/conf/projects/qemucommon/layers.conf b/conf/projects/qemucommon/layers.conf
@@ -6,7 +6,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/qemuriscv32/layers.conf b/conf/projects/qemuriscv32/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/qemuriscv64/layers.conf b/conf/projects/qemuriscv64/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/var-dart-imx6ul/config.conf b/conf/projects/var-dart-imx6ul/config.conf
@@ -25,6 +25,9 @@ IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
 #TEST_SERVER_IP = "10.0.0.13"
 TEST_TARGET = "simpleremote"
 
+# Needed for logic in Varscite wifi bringup script
+PREFERRED_VERSION_libgpiod = "1.%"
+
 IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line

diff --git a/conf/projects/var-som-mx8/config.conf b/conf/projects/var-som-mx8/config.conf
@@ -31,6 +31,9 @@ TEST_TARGET_IP = "10.0.0.36"
 TEST_SERVER_IP = "10.0.0.13"
 TEST_TARGET = "simpleremote"
 
+# Needed for logic in Varscite wifi bringup script
+PREFERRED_VERSION_libgpiod = "1.%"
+
 IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line

diff --git a/conf/projects/var-som-mx8m-nano/config.conf b/conf/projects/var-som-mx8m-nano/config.conf
@@ -33,6 +33,9 @@ TEST_TARGET = "simpleremote"
 
 do_image_wic[depends] += "imx-boot:do_deploy"
 
+# Needed for logic in Varscite wifi bringup script
+PREFERRED_VERSION_libgpiod = "1.%"
+
 IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line

diff --git a/conf/projects/var-som-mx8x/config.conf b/conf/projects/var-som-mx8x/config.conf
@@ -31,6 +31,9 @@ TEST_TARGET_IP = "10.0.0.36"
 TEST_SERVER_IP = "10.0.0.13"
 TEST_TARGET = "simpleremote"
 
+# Needed for logic in Varscite wifi bringup script
+PREFERRED_VERSION_libgpiod = "1.%"
+
 IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line

diff --git a/envsetup.sh b/envsetup.sh
@@ -695,3 +695,7 @@ yoe_install_image() {
   unset WICIMG
 }
 
+# Needed for running per-image ptest images in parallel on qemu
+yoe_create_tap_devices() {
+  sudo runqemu-gen-tapdevs `id -u` ` nproc --all`
+}
diff --git a/sources/meta-clang b/sources/meta-clang
diff --git a/sources/meta-freescale b/sources/meta-freescale
diff --git a/sources/meta-freescale-3rdparty b/sources/meta-freescale-3rdparty
diff --git a/sources/meta-intel b/sources/meta-intel
diff --git a/sources/meta-openembedded b/sources/meta-openembedded
diff --git a/sources/meta-qcom b/sources/meta-qcom
diff --git a/sources/meta-qt6 b/sources/meta-qt6
diff --git a/sources/meta-raspberrypi b/sources/meta-raspberrypi
diff --git a/sources/meta-riscv b/sources/meta-riscv
diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc
@@ -89,6 +89,8 @@ WARN_TO_ERROR_QA ?= "\
 
 WARN_QA:remove = "${WARN_TO_ERROR_QA}"
 ERROR_QA:append = " ${WARN_TO_ERROR_QA}"
+# Yoe does not build binary feeds, this build QA error breaks builds unnessarily
+ERROR_QA:remove = "version-going-backwards"
 #
 # Additional image features
 #

diff --git a/...ite-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.2+fslc.bbappend b/...ite-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p1.2+fslc.bbappend
diff --git a/...ecipes-siot/simpleiot/simpleiot_0.12.2.bb → ...ecipes-siot/simpleiot/simpleiot_0.12.3.bb b/...ecipes-siot/simpleiot/simpleiot_0.12.2.bb → ...ecipes-siot/simpleiot/simpleiot_0.12.3.bb
@@ -7,11 +7,11 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "apps"
 
-DEPENDS = "go-native elm-binary-native nodejs-native"
+DEPENDS += "go-native elm-binary-native nodejs-native curl-native ca-certificates-native"
 
 inherit systemd update-rc.d goarch
 
-SRCREV = "1ccbf799106af7dde86491461295082d90758e1c"
+SRCREV = "93a659b8b4b61ed7718b1846d68e518ebf54799b"
 
 BRANCH ?= "master"
 
@@ -30,6 +30,11 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 20 6 ."
 do_configure[network] = "1"
 do_compile[network] = "1"
 
+# It uses curl-native to fetch npm dependencies which need to also use
+# native certs bundle, by default curl is compiled to point to curl-native's RSS
+# location which is buildtime path of curl-native not the recipe where it is being used
+export CURL_CA_BUNDLE = "${RECIPE_SYSROOT_NATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"
+
 do_configure() {
     export GOPATH=${GOPATH}
     export GOFLAGS="-modcacherw"

diff --git a/sources/poky b/sources/poky