diff -Nru binutils-2.30/debian/changelog binutils-2.30/debian/changelog
--- binutils-2.30/debian/changelog	2018-06-22 06:11:21.000000000 +0000
+++ binutils-2.30/debian/changelog	2018-06-27 09:42:18.000000000 +0000
@@ -1,3 +1,10 @@
+binutils (2.30-22+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
+  * Disable testsuite, it fails on our lxc based autobuilders.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Jun 2018 09:42:18 +0000
+
 binutils (2.30-22) unstable; urgency=medium
 
   * Update, taken from the 2.30 branch 20180622.
diff -Nru binutils-2.30/debian/rules binutils-2.30/debian/rules
--- binutils-2.30/debian/rules	2018-05-02 13:10:08.000000000 +0000
+++ binutils-2.30/debian/rules	2018-06-27 09:42:17.000000000 +0000
@@ -508,7 +508,7 @@
 
 CONFARGS_TARGET_aarch64		= --enable-targets=aarch64_be-linux-gnu
 
-with_check := yes
+with_check := disabled by plugwash
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   # override buildd admins to run the testsuite anyway ...
   ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpcspe sh4))