Manual merge of version 251.2-5+rpi1 and 251.2-7 to produce 251.2-7+rpi1

diff --cc debian/changelog
index 1b37780ed318224e58c0ed6065de26406aa30157,2af8f0c9063a929686fb57552361ebd7ab30d232..26cddd52ab2b9f0b3cff1c7d1215d7dfc0899c95
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,40 +1,54 @@@
- systemd (251.2-5+rpi1) bookworm-staging; urgency=medium
++systemd (251.2-7+rpi1) bookworm-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 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>  Tue, 21 Jun 2022 11:19:08 +0000
++ -- Peter Micheal Greem <plugwash@raspbian.org>  Thu, 14 Jul 2022 18:44:09 +0000
++
+ systemd (251.2-7) unstable; urgency=medium
+ 
+   [ Luca Boccassi ]
+   * sd-boot: add kernel hooks scripts
+ 
+   [ Andrea Pappacoda ]
+   * sd-boot: add initramfs hook (Closes: #826045)
+ 
+   [ Michael Biebl ]
+   * sd-boot: exit early in initramfs and kernel hook scripts if package is
+     removed but not purged
+   * Do not fail with older binutils.
+     Test if the linker supports --no-warn-execstack and --no-warn-rwx-segments
+     before using those flags. (Closes: #1013967)
+ 
+  -- Michael Biebl <biebl@debian.org>  Tue, 28 Jun 2022 14:33:37 +0200
+ 
+ systemd (251.2-6) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Mark systemd-userdbd and systemd-homed as !stage1 (Closes: #1012738)
+ 
+   [ Luca Boccassi ]
+   * Remove unused Lintian overrides
+   * Stop overriding the build directory name.
+     We don't do a separate udeb build anymore, so there's no need
+     to specify a separate build directory.
+   * Use execute_before_/after_ instead of override_
+   * Add nodoc profile support.
+     Co-authored-by: Michael Biebl <biebl@debian.org>
+ 
+   [ Michael Biebl ]
+   * Do not fail EFI build with newer binutils (Closes: #1013482)
+   * shared/microhttp-util: silence gcc warning
+   * Clarify NEWS message about systemd-boot split (Closes: #1013340)
+ 
+  -- Michael Biebl <biebl@debian.org>  Fri, 24 Jun 2022 10:12:34 +0200
  
  systemd (251.2-5) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 3997336924b1f8392c0f87bf0e730f7ab9606ceb,f7612dc6bc96dca8f2b8a1b78d2d3ae1ee062942..cb1745a4100fd7aa2013d858df0ca8b7c5f9701b
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -279,10 -288,10 +288,10 @@@ override_dh_makeshlibs
        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
+       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)/build-deb/machine-id meson test -C build-deb --print-errorlogs $(TEST_TIMEOUT_MULTIPLIER)
+       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)
  endif
  
  %: