diff -Nru systemd-251.3/debian/changelog systemd-251.3/debian/changelog --- systemd-251.3/debian/changelog 2022-07-13 21:05:40.000000000 +0000 +++ systemd-251.3/debian/changelog 2022-08-09 18:16:48.000000000 +0000 @@ -1,3 +1,17 @@ +systemd (251.3-1+rpi1) bookworm-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 Tue, 09 Aug 2022 18:16:48 +0000 + systemd (251.3-1) unstable; urgency=medium * New upstream version 251.3 diff -Nru systemd-251.3/debian/control systemd-251.3/debian/control --- systemd-251.3/debian/control 2022-07-13 21:05:40.000000000 +0000 +++ systemd-251.3/debian/control 2022-08-09 18:16:48.000000000 +0000 @@ -96,6 +96,7 @@ udev (<< 247~), less (<< 563), sicherboot (<< 0.1.6), + raspi-copies-and-fills (<< 0.7) Provides: systemd-sysusers (= ${binary:Version}), systemd-tmpfiles (= ${binary:Version}), Description: system and service manager diff -Nru systemd-251.3/debian/rules systemd-251.3/debian/rules --- systemd-251.3/debian/rules 2022-07-13 21:05:40.000000000 +0000 +++ systemd-251.3/debian/rules 2022-08-09 18:16:48.000000000 +0000 @@ -293,7 +293,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" > obj-$(DEB_HOST_GNU_TYPE)/machine-id # some tests hang under fakeroot, so disable fakeroot env -u LD_PRELOAD SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/machine-id meson test -C obj-$(DEB_HOST_GNU_TYPE) --print-errorlogs $(TEST_TIMEOUT_MULTIPLIER)