diff -Nru systemd-246.4/debian/changelog systemd-246.4/debian/changelog --- systemd-246.4/debian/changelog 2020-09-02 11:30:52.000000000 +0000 +++ systemd-246.4/debian/changelog 2020-09-05 22:24:19.000000000 +0000 @@ -1,3 +1,17 @@ +systemd (246.4-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 239-9+rpi1 by Peter Michael Green 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 241-1+rpi2 by Peter Michael Green 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 Sat, 05 Sep 2020 22:24:19 +0000 + systemd (246.4-1) unstable; urgency=medium * New upstream version 246.4 diff -Nru systemd-246.4/debian/control systemd-246.4/debian/control --- systemd-246.4/debian/control 2020-09-02 11:30:52.000000000 +0000 +++ systemd-246.4/debian/control 2020-09-05 22:24:19.000000000 +0000 @@ -83,6 +83,7 @@ python-dbusmock (<< 0.18), python3-dbusmock (<< 0.18), resolvconf (<< 1.83~), + 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 @@ -343,6 +344,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-246.4/debian/rules systemd-246.4/debian/rules --- systemd-246.4/debian/rules 2020-09-02 11:30:52.000000000 +0000 +++ systemd-246.4/debian/rules 2020-09-05 22:24:19.000000000 +0000 @@ -303,7 +303,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)