diff -Nru systemd-240/debian/changelog systemd-240/debian/changelog
--- systemd-240/debian/changelog	2018-12-27 13:03:57.000000000 +0000
+++ systemd-240/debian/changelog	2019-01-01 20:59:15.000000000 +0000
@@ -1,3 +1,16 @@
+systemd (240-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 239-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 20:22:45 +0000]
+  * 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.
+
+  [changes brought forward from 239-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 22:47:19 +0000]
+  * Force build with gcc-7 (LP: #1793415)
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Jan 2019 20:59:15 +0000
+
 systemd (240-2) unstable; urgency=medium
 
   * Pass seperate dev_t var to device_path_parse_major_minor.
diff -Nru systemd-240/debian/control systemd-240/debian/control
--- systemd-240/debian/control	2018-12-27 13:03:57.000000000 +0000
+++ systemd-240/debian/control	2019-01-01 20:59:15.000000000 +0000
@@ -56,6 +56,8 @@
                tzdata <!nocheck>,
                libcap2-bin <!nocheck>,
                iproute2 <!nocheck>,
+               gcc-7,
+               g++-7,
 
 Package: systemd
 Architecture: linux-any
@@ -83,6 +85,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 +341,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-240/debian/rules systemd-240/debian/rules
--- systemd-240/debian/rules	2018-12-27 13:03:57.000000000 +0000
+++ systemd-240/debian/rules	2019-01-01 20:59:15.000000000 +0000
@@ -3,6 +3,8 @@
 #export DH_VERBOSE = 1
 #export DEB_BUILD_OPTIONS = nostrip
 
+export CC=gcc-7
+export CXX=g++-7
 export LC_ALL = C.UTF-8
 
 include /usr/share/dpkg/default.mk
@@ -289,7 +291,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 meson test -C build-deb $(TEST_TIMEOUT_MULTIPLIER) || ( \