Hi Michael,
On Sat, Oct 15, 2022 at 02:28:12PM +0200, Michael Biebl wrote:
> > 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. ;)
In your other mail, you asked about how to do this. I looked into
salsa-ci and no, there is no easy way to just do this. It completely
ignores build profiles. I think this will have to be fixed at salsa-ci
level even just for noticing nocheck ftbfs that will become RC after
bookworm.
Deferred.
> > 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?
>
> Given that dh-exec is basically unmaintained, I'm a bit reluctant to switch
> to it.
I've gone the easier route of proposing a different patch. It may not be
as pretty, but it works today and looks reasonably maintainable to me.
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-17 08:45:37.000000000 +0200
@@ -1,3 +1,11 @@
+systemd (251.6-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Conditionalize installation of cryptsetup plugins in stage1. (Closes:
+ #1021821)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 17 Oct 2022 08:45:37 +0200
+
systemd (251.6-1) unstable; urgency=medium
* New upstream version 251.6
diff --minimal -Nru systemd-251.6/debian/rules systemd-251.6/debian/rules
--- systemd-251.6/debian/rules 2022-10-14 16:34:00.000000000 +0200
+++ systemd-251.6/debian/rules 2022-10-17 08:45:37.000000000 +0200
@@ -217,6 +217,7 @@
# files shipped by cryptsetup
ifeq (, $(filter stage1, $(DEB_BUILD_PROFILES)))
rm -f debian/tmp/usr/share/man/man5/crypttab.5
+ dh_install -psystemd
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cryptsetup
usr/lib/$(DEB_HOST_MULTIARCH)
endif
# files shipped by systemd
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-17 08:45:32.000000000
+0200
@@ -17,7 +17,6 @@
usr/lib/systemd/
usr/lib/tmpfiles.d/
usr/lib/kernel
-usr/lib/*/cryptsetup/
usr/share/bash-completion/
usr/share/zsh/vendor-completions/
usr/share/dbus-1/
