diff --git a/CHANGELOG.md b/CHANGELOG.md
index baf8e21ea..c0b1c078a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Backport fixes for ARC GCC
 - Use Apache-2.0 implementation for `__stack_chk_fail`
 - Fix libjpeg-turbo build on neon-less ARM
+- Fix mariadb, mongodb, flashrom builds when using clang/musl
+- Add rock64 machine in meta-rockchip
+- Make rpi-cmdline machine specific
+- Add ARC support to GDB
+- Enable debuginfod on cross GDB
+- Fix pkg-config for cross-canadian builds
+- Fix rocksdb on riscv32, mips, and armv6+
+- Make granular packageconfigs for czmq
 - Recipe Upgrades
   - Curl - 7.77.0, kmod - 29, linux-firmware - 20210511, libxcrypt - 4.4.22
   - iproute2 - 5.12.0, libepoxy - 1.5.8, libpcre2 - 10.37
@@ -48,9 +56,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - grpc - 1.38.0, libstemmer - 2.1.0, mpich - 3.4.2, gupnp - 1.2.6
   - thunar - 4.16.8, icewm - 2.3.4, dbus-broker - 29, nftables - 0.9.9
   - libx11 - 1.7.1, linux-intel-dev - 5.12.0, python3-setuptools - 57.0.0
-  - linux-yocto/5.4 - v5.4.123, linux-yocto/5.10 - v5.10.42
+  - linux-yocto/5.4 - v5.4.125, linux-yocto/5.10 - v5.10.43
   - opensaf - 5.21.06, fio - 3.27, gensio - 2.2.7, glog - 0.5.0
-  - linux-fslc-imx - v5.4.125, linux-fslc-lts - v5.10.43, linux-fslc - v5.12.10
+  - linux-fslc-imx - v5.4.126, linux-fslc-lts - v5.10.44, linux-fslc - v5.12.11
   - u-boot-fslc - v2021.07-rc4, at-spi2-core - 2.40.2
   - intel-microcode - 20210608, iozone3 - 492, pipewire - 0.3.30
   - modemmanager - 1.16.6, yelp - 40.2, gvfs - 1.48.1, libsigc++-2.0 - 2.10.7
@@ -58,7 +66,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - abseil-cpp - 20210324.2, speedtest-cli - 2.1.3, rasdaemon - 0.6.7
   - p11-kit - 0.23.24, vala - 0.52.4, epiphany - 40.2, diffoscope - 177
   - opkg - 0.4.5, git - 2.32.0, dtc - 1.6.1, go - 1.16.5, less - 590
-  - ethtool - 5.12, gnutls - 3.7.2, liburcu - 0.13.0
+  - ethtool - 5.12, gnutls - 3.7.2, liburcu - 0.13.0, rocksdb - 6.20.3
+  - c-ares - 1.17.1, nodejs - 14.17.1, libpfm4 - 4.11.0
+  - nfs-utils - 2.5.4, createrepo-c - 0.17.3, enchant2 - 2.3.0
+  - blktrace - 1.3.0, alsa - 1.2.5.1, libpcap - 1.10.1, util-linux - 2.37
+  - libX11 - 1.7.2, mpg123 - 1.28.0, xorgproto - 2021.4.99.2, apt - 2.2.4
+  - meson - 0.58.1, ell - 0.41, m4 - 1.4.19, nettle - 3.7.3, grub - 2.06
+  - glib-2.0 - 2.68.3, erofs-utils - 1.3, gptfdisk - 1.0.8, connman - 1.40
+  - libwpe - 1.10.1, sudo - 1.9.7p1, wpebackend-fdo - 1.10.0, rng-tools - 6.13
+  - libnss-mdns - 0.15.1, libksba - 1.6.0, rsyslog - 8.2106.0, nano - 5.8
+  - rsnapshot - 1.4.4, mg - 20210609, googletest - 1.11.0
+  - fsverity-utils - 1.4, ctags - 5.9.20210613.0, mosquitto - 2.0.11
+  - evince - 40.2, fuse3 - 3.10.4, libzip - 1.8.0, iwd - 1.15
   - Various python recipe version bumps
   - Various gnome recipe version bumps
 - New recipes
diff --git a/conf/site.conf b/conf/site.conf
index d2a246ee9..5da96680b 100644
--- a/conf/site.conf
+++ b/conf/site.conf
@@ -8,8 +8,8 @@ CONF_VERSION = "1"
 # Modify the following if you need to change the types of images generated
 # most of the time, this is set by the machine conf or in a custom image
 # recipe.
-IMAGE_FSTYPES += "ext4.gz tar.xz wic.xz wic.bmap"
-IMAGE_FSTYPES_remove_qemuall = "wic.xz wic.bmap"
+IMAGE_FSTYPES += "wic.xz wic.bmap"
+IMAGE_FSTYPES_remove_qemuall = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap"
 
 DISTRO = "yoe"
 #YOE_PROFILE ?= "yoe-glibc-busyboxinit-eglfs"
diff --git a/sources/meta-arm b/sources/meta-arm
index f5e82358d..3168767bb 160000
--- a/sources/meta-arm
+++ b/sources/meta-arm
@@ -1 +1 @@
-Subproject commit f5e82358d0f2a60d9e127581bcc0dadd07d5c4f8
+Subproject commit 3168767bb4da8f90c8fac31d0bb1ea06ddaedfd1
diff --git a/sources/meta-clang b/sources/meta-clang
index 7980d949c..5455c65e3 160000
--- a/sources/meta-clang
+++ b/sources/meta-clang
@@ -1 +1 @@
-Subproject commit 7980d949ceaa72e76ed02a335ec1f94459ee5e31
+Subproject commit 5455c65e37bd0e881aad8fc318beb6d0a4469703
diff --git a/sources/meta-freescale b/sources/meta-freescale
index 53a7fa113..2684b2270 160000
--- a/sources/meta-freescale
+++ b/sources/meta-freescale
@@ -1 +1 @@
-Subproject commit 53a7fa11367fbc09d1ce4f7f9de7d4b4393c3b71
+Subproject commit 2684b2270a1dda22816a3bb47738d1fa61223c55
diff --git a/sources/meta-freescale-3rdparty b/sources/meta-freescale-3rdparty
index 5f6c423aa..35acd1042 160000
--- a/sources/meta-freescale-3rdparty
+++ b/sources/meta-freescale-3rdparty
@@ -1 +1 @@
-Subproject commit 5f6c423aae0bc614d70e0d7b9bcc78e90b3711bb
+Subproject commit 35acd1042698e1b3fa3a2228e47945e7e4f314f7
diff --git a/sources/meta-intel b/sources/meta-intel
index 0937728bc..e56859c90 160000
--- a/sources/meta-intel
+++ b/sources/meta-intel
@@ -1 +1 @@
-Subproject commit 0937728bcd98dd13d2c6829e1cd604ea2e53e5cd
+Subproject commit e56859c9012e572ec77f822a41df5fe13c37fca5
diff --git a/sources/meta-openembedded b/sources/meta-openembedded
index 9aabe2b4e..fa2d3338f 160000
--- a/sources/meta-openembedded
+++ b/sources/meta-openembedded
@@ -1 +1 @@
-Subproject commit 9aabe2b4ee0d496a2f23cdc59221316b3d79107a
+Subproject commit fa2d3338fb87a38a66d11735b876ce2320045b0d
diff --git a/sources/meta-qcom b/sources/meta-qcom
index a238fd051..06469d0d0 160000
--- a/sources/meta-qcom
+++ b/sources/meta-qcom
@@ -1 +1 @@
-Subproject commit a238fd051b585c725a3fb6b1a37731b622efbb94
+Subproject commit 06469d0d091fd97797385fdc6b4aa8e1bed4ad68
diff --git a/sources/meta-raspberrypi b/sources/meta-raspberrypi
index 246555aea..17b56ab07 160000
--- a/sources/meta-raspberrypi
+++ b/sources/meta-raspberrypi
@@ -1 +1 @@
-Subproject commit 246555aea70660d053f536e6f9dfb5a068ecdaa1
+Subproject commit 17b56ab07505c0df6831e0b39d40c9db26cf1703
diff --git a/sources/meta-riscv b/sources/meta-riscv
index 276941d99..a1828a51a 160000
--- a/sources/meta-riscv
+++ b/sources/meta-riscv
@@ -1 +1 @@
-Subproject commit 276941d9933e4661184f65a527cccfa49d6846a6
+Subproject commit a1828a51a68596cbaebb8bcb78888ddcf1e8367c
diff --git a/sources/meta-rockchip b/sources/meta-rockchip
index 838514a03..7c7e5b9e5 160000
--- a/sources/meta-rockchip
+++ b/sources/meta-rockchip
@@ -1 +1 @@
-Subproject commit 838514a031e30112a7d00f2e20bf7e41264912bc
+Subproject commit 7c7e5b9e59c9cc4fc142da76e2c390908e270fed
diff --git a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
index e5fb0a0ec..1b66d7ff2 100644
--- a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
+++ b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
@@ -21,6 +21,8 @@ IMAGE_INSTALL = "\
 "
 IMAGE_INSTALL_append = "${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', '', ' 96boards-tools', d)}"
 
+IMAGE_INSTALL_append_libc-musl = " gcompat"
+
 export IMAGE_BASENAME = "yoe-simple-image"
 
 BAD_RECOMMENDATIONS += "eudev-hwdb udev-hwdb libmodule-build-perl"
diff --git a/sources/openembedded-core b/sources/openembedded-core
index 254ca956d..5fdc06185 160000
--- a/sources/openembedded-core
+++ b/sources/openembedded-core
@@ -1 +1 @@
-Subproject commit 254ca956d63b4ce6aa294213b60bb943f9f3a9e6
+Subproject commit 5fdc061856348c0dab4dea7cfc0e9fdc1c95d85f