diff -Nru glibc-2.30/debian/changelog glibc-2.30/debian/changelog
--- glibc-2.30/debian/changelog	2020-05-05 18:12:38.000000000 +0000
+++ glibc-2.30/debian/changelog	2020-05-11 14:43:31.000000000 +0000
@@ -1,3 +1,16 @@
+glibc (2.30-7+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
+  * Disable testsuite.
+
+  [changes introduced in 2.29-9+rpi1 by Peter Michale Green]
+  * Change mode on scripts/check-obsolete-constructs.py to 644, 
+    dgit does not like mode 755 files created by patches and the
+    script does not seem to be used for anything in the Debian
+    package.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 May 2020 14:43:31 +0000
+
 glibc (2.30-7) unstable; urgency=medium
 
   * debian/debhelper.in/libc.postinst: re-add /etc/ld.so.nohwcapc code.
diff -Nru glibc-2.30/debian/rules glibc-2.30/debian/rules
--- glibc-2.30/debian/rules	2020-05-05 07:18:45.000000000 +0000
+++ glibc-2.30/debian/rules	2020-05-11 14:43:31.000000000 +0000
@@ -97,7 +97,7 @@
 BASE_MIG = mig
 DEB_GCC_VERSION ?= -9
 
-RUN_TESTSUITE = yes
+RUN_TESTSUITE = no
 TIMEOUTFACTOR = 25
 
 # Set cross and native compiler names, including version.