Bug#1078821: systemd FTBFS with stage1 profile

[Helmut Grohne]

Source: systemd
Version: 256.5-1
Severity: important
Tags: patch ftbfs
User: helmutg at debian.org
Usertags: rebootstrap

Hi,

stage1 is broken again. It's a few failures that accumulated as the
early bootstrap was broken by gcc and linux disagreeing. I'm attaching a
patch to make stage1 work again.

Helmut
-------------- next part --------------
diff --minimal -Nru systemd-256.5/debian/changelog systemd-256.5/debian/changelog
--- systemd-256.5/debian/changelog	2024-08-15 23:00:36.000000000 +0200
+++ systemd-256.5/debian/changelog	2024-08-16 12:45:46.000000000 +0200
@@ -1,3 +1,10 @@
+systemd (256.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix stage1 build. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 16 Aug 2024 12:45:46 +0200
+
 systemd (256.5-1) unstable; urgency=medium
 
   * New upstream version 256.5
diff --minimal -Nru systemd-256.5/debian/rules systemd-256.5/debian/rules
--- systemd-256.5/debian/rules	2024-08-15 16:24:42.000000000 +0200
+++ systemd-256.5/debian/rules	2024-08-16 12:45:46.000000000 +0200
@@ -252,7 +252,7 @@
 	cp -a debian/extra/units-ubuntu/* debian/systemd/usr/lib/systemd/system/
 endif
 
-ifeq (, $(filter pkg.systemd.upstream, $(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 pkg.systemd.upstream, $(DEB_BUILD_PROFILES)))
 ifeq ($(DEB_VENDOR),Debian)
 ifneq ($(TEMPLATE_EFI_ARCH),)
 	debian/extra/gen-signing-template $(DEB_VERSION) $(DEB_HOST_ARCH) $(TEMPLATE_EFI_ARCH)
diff --minimal -Nru systemd-256.5/debian/systemd.install systemd-256.5/debian/systemd.install
--- systemd-256.5/debian/systemd.install	2024-08-15 21:40:02.000000000 +0200
+++ systemd-256.5/debian/systemd.install	2024-08-16 12:45:46.000000000 +0200
@@ -237,7 +237,7 @@
 usr/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket
 usr/lib/systemd/system/sockets.target.wants/systemd-journald.socket
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket
-[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
+[amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
 usr/lib/systemd/system/sockets.target.wants/systemd-sysext.socket
 usr/lib/systemd/system/soft-reboot.target
 usr/lib/systemd/system/sound.target
@@ -332,8 +332,8 @@
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrextend.socket
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrfs-root.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrfs at .service
-[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock.socket
-[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock at .service
+[amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock.socket
+[amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock at .service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-file-system.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-code.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-config.service
diff --minimal -Nru systemd-256.5/debian/systemd.manpages systemd-256.5/debian/systemd.manpages
--- systemd-256.5/debian/systemd.manpages	2024-08-15 21:40:02.000000000 +0200
+++ systemd-256.5/debian/systemd.manpages	2024-08-16 12:45:46.000000000 +0200
@@ -23,8 +23,7 @@
 debian/tmp/usr/share/man/man1/systemd-id128.1
 debian/tmp/usr/share/man/man1/systemd-inhibit.1
 debian/tmp/usr/share/man/man1/systemd-machine-id-setup.1
-[amd64 i386 arm64 armhf riscv64] <!stage1 !pkg.systemd.upstream> debian/tmp/usr/share/man/man1/systemd-measure.1
-debian/tmp/usr/share/man/man1/systemd-measure.1
+<!stage1> debian/tmp/usr/share/man/man1/systemd-measure.1
 debian/tmp/usr/share/man/man1/systemd-mount.1
 debian/tmp/usr/share/man/man1/systemd-notify.1
 debian/tmp/usr/share/man/man1/systemd-path.1