diff -Nru systemd-239/debian/changelog systemd-239/debian/changelog
--- systemd-239/debian/changelog	2018-09-12 17:07:38.000000000 +0000
+++ systemd-239/debian/changelog	2018-09-20 20:22:45.000000000 +0000
@@ -1,3 +1,12 @@
+systemd (239-9+rpi1) buster-staging; urgency=medium
+
+  * Disable testsuite, it fails on some of our buildboxes (probablly because of
+    old kernels).
+  * Add breaks on raspi-copies-and-fills, it doesn't seem to get on with
+    this version of systemd/udev.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Sep 2018 20:22:45 +0000
+
 systemd (239-9) unstable; urgency=medium
 
   * autopkgtest: Remove needs-recommends runtime restriction.
diff -Nru systemd-239/debian/control systemd-239/debian/control
--- systemd-239/debian/control	2018-09-12 17:07:38.000000000 +0000
+++ systemd-239/debian/control	2018-09-20 20:22:45.000000000 +0000
@@ -81,6 +81,7 @@
         laptop-mode-tools (<< 1.68~),
         python-dbusmock (<< 0.18),
         python3-dbusmock (<< 0.18),
+        raspi-copies-and-fills (<< 0.7)
 Replaces: udev (<< 228-5),
 Description: system and service manager
  systemd is a system and service manager for Linux. It provides aggressive
@@ -338,6 +339,7 @@
         ifupdown (<< 0.8.5~),
         ifplugd (<< 0.28-19.1~),
         joystick (<< 1:1.4.9-1~),
+        raspi-copies-and-fills (<< 0.7)
 Replaces: systemd (<< 233-4)
 Description: /dev/ and hotplug management daemon
  udev is a daemon which dynamically creates and removes device nodes from
diff -Nru systemd-239/debian/rules systemd-239/debian/rules
--- systemd-239/debian/rules	2018-09-12 17:07:38.000000000 +0000
+++ systemd-239/debian/rules	2018-09-20 20:22:34.000000000 +0000
@@ -280,7 +280,7 @@
 	dh_makeshlibs --remaining-packages -- -c$(GENSYMBOLS_LEVEL)
 
 override_dh_auto_test:
-ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 	echo "01234567890123456789012345678901" > build-deb/machine-id
 	# some tests hang under fakeroot, so disable fakeroot
 	env -u LD_PRELOAD SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/build-deb/machine-id ninja -C build-deb test || ( \