diff -Nru systemd-251.4/debian/changelog systemd-251.4/debian/changelog --- systemd-251.4/debian/changelog 2022-08-27 21:39:04.000000000 +0000 +++ systemd-251.4/debian/changelog 2022-09-24 02:56:57.000000000 +0000 @@ -1,3 +1,17 @@ +systemd (251.4-3+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 Sat, 24 Sep 2022 02:56:57 +0000 + systemd (251.4-3) unstable; urgency=medium * resolv.conf: take backup as a fallback in case resolved/resolv.conf diff -Nru systemd-251.4/debian/control systemd-251.4/debian/control --- systemd-251.4/debian/control 2022-08-26 22:11:35.000000000 +0000 +++ systemd-251.4/debian/control 2022-09-24 02:56:57.000000000 +0000 @@ -97,6 +97,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.4/debian/rules systemd-251.4/debian/rules --- systemd-251.4/debian/rules 2022-08-20 21:36:36.000000000 +0000 +++ systemd-251.4/debian/rules 2022-09-24 02:56:57.000000000 +0000 @@ -289,7 +289,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)