From b1d2fd0e17748261b760932b5a4bc807c3a580c5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 22 Nov 2021 14:20:49 -0800 Subject: [PATCH 1/6] updater: Check for device before mounting Fixes https://github.com/raspberrypi/linux/issues/4722 Signed-off-by: Khem Raj --- .../updater/files/updater.installer | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sources/meta-yoe/recipes-support/updater/files/updater.installer b/sources/meta-yoe/recipes-support/updater/files/updater.installer index 20b26cdaf..ef36a0288 100644 --- a/sources/meta-yoe/recipes-support/updater/files/updater.installer +++ b/sources/meta-yoe/recipes-support/updater/files/updater.installer @@ -214,14 +214,16 @@ format_emmc_data() { mount_usb() { mkdir -p $USB_MOUNT_POINT - if ! mount /dev/sda $USB_MOUNT_POINT; then - if ! mount /dev/sda1 $USB_MOUNT_POINT; then - msg_splash "No USB Installer disk detected" - return 1 + for part in sda1 sda sdb1 sdb + do + test -e /dev/$part && mount /dev/$part $USB_MOUNT_POINT 2>/dev/null + if [ $? -eq 0 ]; then + msg_splash "Found Installer disk at /dev/$part" + return 0 fi - fi - msg_splash "USB disk mounted" - return 0 + done + msg_splash "No USB Installer disk detected" + return 1 } umount_usb() { From 824b7a18ce93943ea4346e92d71c2ca68a553a9c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Nov 2021 10:42:17 -0800 Subject: [PATCH 2/6] linux-ti-staging: Enable USB stick in updater Fixes https://github.com/YoeDistro/yoe-distro/issues/586 Signed-off-by: Khem Raj --- .../recipes-kernel/linux/linux-ti-staging/updater.cfg | 9 +++++++++ .../recipes-kernel/linux/linux-ti-staging_%.bbappend | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging/updater.cfg diff --git a/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging/updater.cfg b/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging/updater.cfg new file mode 100644 index 000000000..ac3229e34 --- /dev/null +++ b/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging/updater.cfg @@ -0,0 +1,9 @@ +CONFIG_USB=y +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_DSPS=y +CONFIG_USB_STORAGE=y +CONFIG_USB_MUSB_AM35X=y +CONFIG_AM335X_CONTROL_USB=y +CONFIG_AM335X_PHY_USB=y +CONFIG_USB_GADGET=y +CONFIG_NOP_USB_XCEIV=y diff --git a/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend b/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend index db53bf82f..7b6564e99 100644 --- a/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend +++ b/sources/meta-yoe/dynamic-layers/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend @@ -1,5 +1,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://wireguard.cfg" +SRC_URI += "file://wireguard.cfg \ + file://updater.cfg \ + " -KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/wireguard.cfg" +KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/wireguard.cfg \ + ${WORKDIR}/updater.cfg \ + " From db9e68332c606c2e4c9590d49e0f8b8c5622f7ab Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 22 Nov 2021 14:37:03 -0800 Subject: [PATCH 3/6] Layer Updates: sources/meta-openembedded sources/meta-qt5 * sources/meta-openembedded f065bcdee7...00083a8dc5 (16): > python3-aiosignal, python3-frozenlist: Add native & nativestdk package support > python3-cchardet: add BBCLASSEXTEND = "native nativesdk" > python3-aiohue: Upgrade 2.6.3 -> 3.0.1 > python3-simplejson: Upgrade 3.17.5 -> 3.17.6 > python3-cmd2: Upgrade 2.3.0 -> 2.3.1 > python3-imageio: Upgrade 2.10.5 -> 2.11.0 > python3-prompt-toolkit: Upgrade 3.0.21 -> 3.0.22 > fluidsynth: upgrade 2.2.2 -> 2.2.3 > libxfce4ui: upgrade 4.16.0 -> 4.16.1 > mousepad: upgrade 0.5.5 -> 0.5.7 > catfish: upgrade 4.16.0 -> 4.16.3 > xfce4-sensors-plugin: upgrade 1.4.1 -> 1.4.2 > xfce4-cpugraph-plugin: upgrade 1.2.3 -> 1.2.5 > ristretto: upgrade 0.11.0 -> 0.12.0 > xfce4-whiskermenu-plugin: upgrade 2.5.3 -> 2.6.2 > poppler: upgrade 21.10.0 -> 21.11.0 * sources/meta-qt5 d2d295d...7865f41 (1): > nativesdk-qtbase: inherit pkgconfig Signed-off-by: Khem Raj --- sources/meta-openembedded | 2 +- sources/meta-qt5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/meta-openembedded b/sources/meta-openembedded index f065bcdee..00083a8dc 160000 --- a/sources/meta-openembedded +++ b/sources/meta-openembedded @@ -1 +1 @@ -Subproject commit f065bcdee7f0c97059b073b944882a52f1d587c9 +Subproject commit 00083a8dc5a608502f6192452c7cd54b86c956d0 diff --git a/sources/meta-qt5 b/sources/meta-qt5 index d2d295d45..7865f41cb 160000 --- a/sources/meta-qt5 +++ b/sources/meta-qt5 @@ -1 +1 @@ -Subproject commit d2d295d45f554f4b79813327ca86fd7c901e5665 +Subproject commit 7865f41cb4cad25752030da6dd87a17c6933dd8a From 00d144b026c516430f38b7b03310337a0d9d8d70 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Nov 2021 10:43:48 -0800 Subject: [PATCH 4/6] Layer Updates: sources/meta-arm sources/meta-raspberrypi sources/openembedded-core * sources/meta-arm 26f92c0...1c871d3 (3): > machine/qemuarm64-secureboot.conf: add optee-ftpm > arm: add optee-ftpm recipe > optee: update optee-os.inc to support external TAs * sources/meta-raspberrypi 54213e7...63a3d8c (2): > linux-raspberrypi: Upgrade to 5.10.81 > parselogs: Update the error regexps to 5.10 kernel * sources/openembedded-core 3966cbf5c8a...9febfe70507 (18): > glibc-tests: Do not set SYSTEMD_SERVICE > ptest-packagelists: Handle glibc vs musl for ptest > glibc: ptest: Add running glibc time related test suite (Y2038) with ptest > gmp: fix CVE-2021-43618 > libjpeg-turbo: upgrade 2.1.1 -> 2.1.2 > python3-mako: upgrade 1.1.5 -> 1.1.6 > mesa: upgrade 21.2.5 -> 21.3.0 > libcap: upgrade 2.60 -> 2.61 > python3-scons: upgrade 4.2.0 -> 4.3.0 > systemtap: upgrade 4.5 -> 4.6 > stress-ng: upgrade 0.13.06 -> 0.13.07 > buildhistory: Fix srcrevs output > buildhistory: Drop support for older bitbakes > classes/crate-fetch: Ensure crate fetcher is available > rootfs-postcommands: update systemd_create_users > classes/meson: Add optional rust definitions > oeqa: fix warnings for append operators combined with += > rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH Signed-off-by: Khem Raj --- sources/meta-arm | 2 +- sources/meta-raspberrypi | 2 +- sources/openembedded-core | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/meta-arm b/sources/meta-arm index 26f92c011..1c871d3ff 160000 --- a/sources/meta-arm +++ b/sources/meta-arm @@ -1 +1 @@ -Subproject commit 26f92c011e2347a64bfee7aa8ae01e557f9b4d34 +Subproject commit 1c871d3ffed071527fe25adde1458af293ac871c diff --git a/sources/meta-raspberrypi b/sources/meta-raspberrypi index 54213e712..63a3d8cb1 160000 --- a/sources/meta-raspberrypi +++ b/sources/meta-raspberrypi @@ -1 +1 @@ -Subproject commit 54213e7127443d630765bf6073dc6bc1073705d2 +Subproject commit 63a3d8cb17c5d1affe8f2848f45fcc6a706f9412 diff --git a/sources/openembedded-core b/sources/openembedded-core index 3966cbf5c..9febfe705 160000 --- a/sources/openembedded-core +++ b/sources/openembedded-core @@ -1 +1 @@ -Subproject commit 3966cbf5c8a2dbc3a4f0f3eefdbeeb83f522bf87 +Subproject commit 9febfe70507035fd75b0aeb108b1bbb6996f9b78 From bd9d72c9ab56d30e8b96fa2f26814148c68b67a0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Nov 2021 10:47:18 -0800 Subject: [PATCH 5/6] CHANGELOG.md: Document changes Signed-off-by: Khem Raj --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a4681a18..4d7acf7ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Use wayland distro feature for native builds - Fix task-depends.dot for multiconfig targets - Adjust recipes using meson to work with meson 0.60+ -- Upgrade linux-raspberrypi to 5.10.78 +- Upgrade linux-raspberrypi to 5.10.81 +- Fix parselogs regular expressions for 5.10 kernel - Add Pi Zero 2 Wifi 64bit yocto machine in meta-raspberrypi - Upgrade php to 8.x - Upgrade linux-staging-ti to 5.10.65 @@ -55,6 +56,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Upgrade and fix freerdp 2.3.0 -> 2.4.1 - Fix mozjs on centos7 build hosts - Add Wi-Fi/BT drivers for CM4 and Pi 400 to Raspberrypi4 machine configs +- Upgrade mesa to 21.3.0 +- Fix OEQA warnings for append operators combined with += +- Improve rust support in meson based builds - Assorted recipe upgrades - New recipes - ntpsec, mozjs-78, gtk4, python3-imgtool, fwupd, fwupd-efi From 7db0cb9d8f483406ada583343e9d418dc392af1a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Nov 2021 19:19:21 -0800 Subject: [PATCH 6/6] Layer Updates: sources/meta-openembedded * sources/meta-openembedded 00083a8dc5...03c5f64174 (12): > fwupd: upgrade to 1.7.2 > libnetfilter-log: upgrade 1.0.1 -> 1.0.2 > openldap: upgrade 2.4.58 -> 2.5.8 > xmlsec1: upgrade 1.2.32 -> 1.2.33 > thin-provisioning-tools: upgrade 0.8.5 -> 0.9.0 > tesseract: upgrade 4.1.1 -> 4.1.3 > qpdf: upgrade 10.3.2 -> 10.4.0 > mariadb: Fix openssl 3.x compatibility > libqb: upgrade 2.0.3 -> 2.0.4 > cryptsetup: upgrade 2.4.1 -> 2.4.2 > wireguard-tools: upgrade 1.0.20210315 -> 1.0.20210914 > lvgl: Update to 8.1.0 Signed-off-by: Khem Raj --- sources/meta-openembedded | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/meta-openembedded b/sources/meta-openembedded index 00083a8dc..03c5f6417 160000 --- a/sources/meta-openembedded +++ b/sources/meta-openembedded @@ -1 +1 @@ -Subproject commit 00083a8dc5a608502f6192452c7cd54b86c956d0 +Subproject commit 03c5f64174b563bf80d7ebdccffe9b19b1719998