diff -Nru systemd-245.5/debian/changelog systemd-245.5/debian/changelog
--- systemd-245.5/debian/changelog 2020-05-17 17:28:49.000000000 +0000
+++ systemd-245.5/debian/changelog 2020-05-20 04:55:20.000000000 +0000
@@ -1,3 +1,20 @@
+systemd (245.5-3+rpi1) bullseye-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)
+
+ [changes brought forward from 241-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 02 Apr 2019 19:29:26 +0000]
+ * Bump "breaks" on raspi-copies-and-fills to << 0.12
+ (raspi-copies-and-fills was reverted by the raspberry pi foundation)
+
+ -- Raspbian forward porter <root@raspbian.org> Wed, 20 May 2020 04:55:20 +0000
+
systemd (245.5-3) unstable; urgency=medium
[ Michael Biebl ]
diff -Nru systemd-245.5/debian/control systemd-245.5/debian/control
--- systemd-245.5/debian/control 2020-05-17 17:28:49.000000000 +0000
+++ systemd-245.5/debian/control 2020-05-20 04:55:20.000000000 +0000
@@ -57,6 +57,8 @@
tzdata <!nocheck>,
libcap2-bin <!nocheck>,
iproute2 <!nocheck>,
+ gcc-7,
+ g++-7,
Package: systemd
Architecture: linux-any
@@ -80,6 +82,7 @@
Breaks: systemd-shim (<< 10-4~),
python-dbusmock (<< 0.18),
python3-dbusmock (<< 0.18),
+ raspi-copies-and-fills (<< 0.7)
Description: system and service manager
systemd is a system and service manager for Linux. It provides aggressive
parallelization capabilities, uses socket and D-Bus activation for starting
@@ -340,6 +343,7 @@
s390-tools (>> 1.6.2) [s390],
Conflicts: hal
Breaks: systemd (<< 233-4),
+ raspi-copies-and-fills (<< 0.12)
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-245.5/debian/rules systemd-245.5/debian/rules
--- systemd-245.5/debian/rules 2020-05-17 17:28:49.000000000 +0000
+++ systemd-245.5/debian/rules 2020-05-20 04:55:20.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
@@ -302,7 +304,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 --print-errorlogs $(TEST_TIMEOUT_MULTIPLIER)