diff -Nru vboot-utils-0~R99-14469.B/debian/changelog vboot-utils-0~R99-14469.B/debian/changelog
--- vboot-utils-0~R99-14469.B/debian/changelog	2022-07-18 09:08:11.000000000 +0000
+++ vboot-utils-0~R99-14469.B/debian/changelog	2022-08-06 23:28:21.000000000 +0000
@@ -1,3 +1,11 @@
+vboot-utils (0~R99-14469.B-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0~R99-14469.B-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 21 Jun 2022 09:42:25 +0000]
+  * Build with clang 11 to avoid armv7 contamination.
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Aug 2022 23:28:21 +0000
+
 vboot-utils (0~R99-14469.B-2) unstable; urgency=medium
 
   * Fix switch to llvm-toolchain-13: use libfuzzer-13-dev (Closes: #1000916)
diff -Nru vboot-utils-0~R99-14469.B/debian/control vboot-utils-0~R99-14469.B/debian/control
--- vboot-utils-0~R99-14469.B/debian/control	2022-07-18 09:08:11.000000000 +0000
+++ vboot-utils-0~R99-14469.B/debian/control	2022-08-06 23:28:21.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Sophie Brun <sophie@offensive-security.com>
 Uploaders: Raphaël Hertzog <raphael@offensive-security.com>
 Build-Depends: debhelper-compat (= 13),
-               clang-13,
+               clang-11,
 	       libflashrom-dev,
                libfuzzer-13-dev,
                liblzma-dev,
diff -Nru vboot-utils-0~R99-14469.B/debian/rules vboot-utils-0~R99-14469.B/debian/rules
--- vboot-utils-0~R99-14469.B/debian/rules	2022-07-18 09:08:11.000000000 +0000
+++ vboot-utils-0~R99-14469.B/debian/rules	2022-08-06 23:28:21.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export CC = clang-13
+export CC = clang-11
 export _machname = $(DEB_HOST_ARCH)
 
 override_dh_auto_build:
@@ -25,7 +25,7 @@
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	make runtests V=1
+	#make runtests V=1
 endif
 
 %: