From 48959af84b35e68e757fd8274a11da16a484d214 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Apr 2024 09:57:52 -0700 Subject: [PATCH 1/5] envsetup: Narrow down regexp match for MACHINE Current regexp would match anything followed by MACHINE until `=`, however this means its greedier than we want it to be since it will also match MACHINE_FEATURES, MACHINE_ARCH etc. which are valid bitbake variables that a project might need to set/reset/modify, therefore tighten the regular expression a bit here. Signed-off-by: Khem Raj --- envsetup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 539dd86ed..de2378cd3 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -119,10 +119,10 @@ fi export PROJECT echo "Setting PROJECT=$PROJECT" -MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d '"' -f 2` +MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE[[:space:]]*=' | cut -d '"' -f 2` if [ -z "$MACHINE" ]; then - MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d "'" -f 2` + MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE[[:space:]]*=' | cut -d "'" -f 2` fi if [ -z "$MACHINE" ]; then From 8771f41fd3754987e2f7e2ba0cb0ef099b30ae95 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 4 Apr 2024 11:26:34 -0700 Subject: [PATCH 2/5] var-som-mx8: Enable OPTEE Signed-off-by: Khem Raj --- conf/projects/var-som-mx8/config.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/projects/var-som-mx8/config.conf b/conf/projects/var-som-mx8/config.conf index dcbec0dd1..18efefab1 100644 --- a/conf/projects/var-som-mx8/config.conf +++ b/conf/projects/var-som-mx8/config.conf @@ -38,6 +38,12 @@ IMG_VERSION = "0.0.1" ##################################################################### # add project specific configuration below this line ##################################################################### +# Enable optee see +# https://variwiki.com/index.php?title=IMX8_OPTEE&release=mx8mp-yocto-mickledore-6.1.36_2.1.0-v1.2 +MACHINE_FEATURES:append = " optee" +DISTRO_FEATURES:append = " optee" +IMAGE_INSTALL:append = " optee-os" + #require conf/distro/include/lto.inc #DISTRO_FEATURES:append = " lto" From ab7ea30eff0591f85f3b984385d070c24a7e32fe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Apr 2024 10:22:25 -0700 Subject: [PATCH 3/5] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e70369fc..53bbb785e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to - Upgrade gstreamer to 1.22.11 - Fix openssl crash on aarch64 w/o crypto instructions - Accomodate llvm in readelf and objdump commands in oe packaging +- Enable OPTEE for var-som-mx8 project ### Added From 8f096f8c9872a0fa09a7142bd4553a63872901e2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Apr 2024 08:51:09 -0700 Subject: [PATCH 4/5] Layer Updates: sources/meta-clang sources/meta-freescale sources/meta-openembedded sources/meta-qt6 sources/meta-variscite-bsp sources/poky * sources/meta-clang 73c00a5...13dcab8 (1): > clang: Upgrade to 18.1.3 * sources/meta-freescale 19d33d87...4968b000 (1): > Merge pull request #1780 from rafluan/fix-dtb-paths * sources/meta-openembedded a6bcdca5b4...5a02b76b82 (21): > python3-pillow: Upgrade 10.1.0 -> 10.3.0 and fix ptest > python3-bleak: enable ptest and add missing runtime dependency > libfido2: new recipe > dash: correct licence > libtorrent: remove CVE mention > unbound: upgrade 1.19.1 -> 1.19.3 > mbedtls: upgrade 2.28.7 -> 2.28.8 > mbedtls: upgrade 3.5.2 -> 3.6.0 > mdns: Upgrade 2200.80.16 -> 2200.100.94.0.2 > avro: add recipe for c++ > Revert "libmbim: upgrade 1.30.0 -> 1.31.2" > Revert "libqmi: upgrade 1.34.0 -> 1.35.2" > syslog-ng: fix build without ipv6 in distro features > python3-pyzmq: Fix ptests > python3-whoosh: Fix an intermittent ptest > python3-pydantic-core: Skip failing ptests > python3-pydantic: Ignore failing testcases > python3-netaddr: Ignore failing tests on musl > python3-pydbus: Fix typo in ptest package name > python3-pydantic-core: Enable benchmark tests > rocksdb: fix build error for DEBUG_BUILD * sources/meta-qt6 aa2a2ce...2828a11 (2): > Merge pull request #43 from YoeDistro/kraj/6.7 > Merge pull request #42 from YoeDistro/kraj/6.7 * sources/meta-variscite-bsp e736253...5230637 (1): > Merge pull request #17 from YoeDistro/kraj/mickledore-var02 * sources/poky 30d88a20432...110ee701b33 (26): > sstatesig: fix netrc.NetrcParseError exception > oeqa/selftest/devtool: fix test_devtool_add_git_style2 > go: upgrade 1.22.1 -> 1.22.2 > go: keep the patches in order > perf: fix TMPDIR contamination for recent mainline kernels > perf: Fix QA error due to most recent kernel > lttng-modules: update to v2.13.12 > linux-yocto-dev: bump to v6.9 > binutils: gprofng - change use of bignum to use of bignint > oeqa/selftest/overlayfs: test read-only rootfs > pixman: explicitly disable openmp in native builds > linux-firmware: update to 20240312 > autotools: update link in comment for cross compiling > image-live.bbclass: Adjust the default value for INITRD_LIVE > libseccomp: Add back in PTESTS_SLOW list > epiphany: update 45.3 -> 46.0 > gtk+3: disable wayland without opengl > glibc: Skip 2 qemu tests that can hang in oe-selftest > webkitgtk: update 2.42.5 -> 2.44.0 > gnutls: upgrade 3.8.3 -> 3.8.4 > util-linux: Set the license for util-linux-fcntl-lock to MIT > lttng-tools: fix rotation-destroy-flush test fails if no kernel module present > gmp: improve reproducibility > curl: improve reproducibility > bash: improve reproducibility > ovmf: set CVE_PRODUCT and CVE_VERSION Signed-off-by: Khem Raj --- sources/meta-clang | 2 +- sources/meta-freescale | 2 +- sources/meta-openembedded | 2 +- sources/meta-qt6 | 2 +- sources/meta-variscite-bsp | 2 +- sources/poky | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/meta-clang b/sources/meta-clang index 73c00a5a0..13dcab852 160000 --- a/sources/meta-clang +++ b/sources/meta-clang @@ -1 +1 @@ -Subproject commit 73c00a5a0bebc871854e43cc1f0fe5bd5e5ad1d7 +Subproject commit 13dcab852c5bcd51fd75ae84ace9eddd99254653 diff --git a/sources/meta-freescale b/sources/meta-freescale index 19d33d87a..4968b000d 160000 --- a/sources/meta-freescale +++ b/sources/meta-freescale @@ -1 +1 @@ -Subproject commit 19d33d87a3f5bd836ee472f207f20c4e126a7d6b +Subproject commit 4968b000daa74e959da40ed6fccd25a22eb39f61 diff --git a/sources/meta-openembedded b/sources/meta-openembedded index a6bcdca5b..5a02b76b8 160000 --- a/sources/meta-openembedded +++ b/sources/meta-openembedded @@ -1 +1 @@ -Subproject commit a6bcdca5b4681906b00e12f6bc4af465c85bad9f +Subproject commit 5a02b76b82d1f48986212c33dddf7986385c79ef diff --git a/sources/meta-qt6 b/sources/meta-qt6 index aa2a2ceff..2828a1138 160000 --- a/sources/meta-qt6 +++ b/sources/meta-qt6 @@ -1 +1 @@ -Subproject commit aa2a2ceffb06f3306d02725143f3f51304468ea3 +Subproject commit 2828a11384f6b5b17f2aa6d3114cf4aa1937d579 diff --git a/sources/meta-variscite-bsp b/sources/meta-variscite-bsp index e73625314..5230637da 160000 --- a/sources/meta-variscite-bsp +++ b/sources/meta-variscite-bsp @@ -1 +1 @@ -Subproject commit e7362531418428ac7fdc377b611e5f710e3a9754 +Subproject commit 5230637da4bf3f4eab2a37d86d871de09c89514f diff --git a/sources/poky b/sources/poky index 30d88a204..110ee701b 160000 --- a/sources/poky +++ b/sources/poky @@ -1 +1 @@ -Subproject commit 30d88a20432d2ddca555c9b6690450b260e523ec +Subproject commit 110ee701b33600f14e40544bf9354774cd85c5ce From 71d32730ed53ecc74f793ebf3a1cbe59ef3ec676 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Apr 2024 08:54:58 -0700 Subject: [PATCH 5/5] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53bbb785e..f46ffc664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,11 +17,16 @@ and this project adheres to - Fix openssl crash on aarch64 w/o crypto instructions - Accomodate llvm in readelf and objdump commands in oe packaging - Enable OPTEE for var-som-mx8 project +- Upgrade Golang to 1.22.2 +- Upgrade webkit to 2.44.0 +- Fix ptests for several meta-python recipes +- Update QT6 to latest 6.7 +- Upgrade clang compiler to 18.1.3 ### Added - New Recipes - - highway, libjxl, python-libusb1 + - highway, libjxl, python-libusb1, libfido2, avro-c++ ### Removed