Source: systemd Version: 251.6-1 Severity: important Justification: breaks architecture bootstrap Tags: ftbfs patch User: helm...@debian.org Usertags: rebootstrap
Hi, the addition of cryptsetup plugins broke the stage1 build. Do you think it would be possible to add a native stage1 build pass to salsa-ci such that you'd notice earlier? Of course you'd only get the failure then, not the patch. ;) What happens to break is missing files in dh_install. Clearly, the intention was not to include cryptsetup plugins in stage1 and I agree with that. Unfortunately, dh_install itself does not allow conditionalizing lines in .install files. I'm attaching a patch that uses dh-exec to achieve this and hope you like it. If not, maybe we can install the plugins from debian rules manually? Helmut
diff --minimal -Nru systemd-251.6/debian/changelog systemd-251.6/debian/changelog --- systemd-251.6/debian/changelog 2022-10-14 16:34:00.000000000 +0200 +++ systemd-251.6/debian/changelog 2022-10-15 07:32:34.000000000 +0200 @@ -1,3 +1,11 @@ +systemd (251.6-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Conditionalize installation of cryptsetup plugins in stage1 using + dh-exec. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Sat, 15 Oct 2022 07:32:34 +0200 + systemd (251.6-1) unstable; urgency=medium * New upstream version 251.6 diff --minimal -Nru systemd-251.6/debian/control systemd-251.6/debian/control --- systemd-251.6/debian/control 2022-10-14 16:34:00.000000000 +0200 +++ systemd-251.6/debian/control 2022-10-15 07:31:23.000000000 +0200 @@ -14,6 +14,7 @@ Vcs-Browser: https://salsa.debian.org/systemd-team/systemd Homepage: https://www.freedesktop.org/wiki/Software/systemd Build-Depends: debhelper-compat (= 13), + dh-exec, dh-sequence-installnss, dh-sequence-package-notes, pkg-config, diff --minimal -Nru systemd-251.6/debian/systemd.install systemd-251.6/debian/systemd.install --- systemd-251.6/debian/systemd.install 2022-10-14 16:34:00.000000000 +0200 +++ systemd-251.6/debian/systemd.install 2022-10-15 07:32:23.000000000 +0200 @@ -1,3 +1,4 @@ +#!/usr/bin/dh-exec etc/ bin/ lib/modprobe.d/ @@ -17,7 +18,7 @@ usr/lib/systemd/ usr/lib/tmpfiles.d/ usr/lib/kernel -usr/lib/*/cryptsetup/ +<!stage1> usr/lib/*/cryptsetup/ usr/share/bash-completion/ usr/share/zsh/vendor-completions/ usr/share/dbus-1/
