Hi,

Cyril Brulebois <k...@debian.org> (2025-01-14):
> Yes, I've just hit this too, trying to install a newer linux-image
> package in my sid chroot, and I concur with your analysis: this looks
> like an incomplete move and I don't understand how this could possibly
> work without an accompanying change in the shell script, like the one
> you suggested.
> 
> I'm not seeing any bugfixes in the Git repository, maybe I'll NMU this
> package later tonight, fixing both installability and upgradability,
> including for reverse dependencies…

I've confirmed the bugfix in my sid devel schroot, which is an important
use case to me, but doesn't ensure the generated initrd makes a boot
possible.

Therefore I've also installed a brand new trixie systemd with a daily
d-i build, initially with initramfs-tools. Then I tried (and failed) to
install tiny-initramfs(-core), which is indeed fixed by deploying the
patched version. And the resulting system still boots fine.

Two things:
 - As mentioned in the commit message, I'm not tidying up the .in + sed
   call, which are likely unnecessary at this point (since NMU means
   minimal changes).
 - I've spotted some mention of missing crc/intel module but the screen
   blinks a little too fast and it's already 3am… possibly that's linked
   to the default CPU for my QEMU setup and the presence of the
   intel-microcode package, but I'm not considering this a blocker for
   an upload fixing a grave bug.

You'll find the format-patch'd commit attached and the resulting source
debdiff.

(I wondered a little while about using DELAYED/n but it seems to me the
fix is straightforward enough and the bug grave enough — no pun intended
— to avoid further delays. Apologies if that's considered too hasty on
your side.)


Cheers,
-- 
Cyril Brulebois (k...@debian.org)            <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant
From 199cfd6dbc5902e4bb660995295944890e2407c3 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <k...@debian.org>
Date: Tue, 14 Jan 2025 02:19:58 +0100
Subject: [PATCH] Adjust PKGLIBEXECDIR in mktirfs (Closes: #1092851).

This is required after the move to /usr/libexec implemented in the
previous upload, fixing failure to copy init-static (or init-debug-static
in debug mode).

Thanks for the report, Michael Krylov!

This is a minimal change per NMU policy, but the .in + sed mechanism could
probably go away as that's the only variable that is getting substituted
this way.
---
 debian/changelog | 11 +++++++++++
 debian/rules     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ac4eaf8..f3127ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tiny-initramfs (0.1-6.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Adjust PKGLIBEXECDIR in mktirfs to match the move to /usr/libexec
+    implemented in the previous upload, fixing failure to copy init-static
+    (or init-debug-static in debug mode). Thanks for the report, Michael
+    Krylov!
+    Closes: #1092851
+
+ -- Cyril Brulebois <k...@debian.org>  Tue, 14 Jan 2025 02:19:24 +0100
+
 tiny-initramfs (0.1-6) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index 68d947b..b79e2e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_auto_build:     $(foreach variant,$(VARIANTS),dh_auto_build_$(varian
 override_dh_auto_install:   $(foreach variant,$(VARIANTS),dh_auto_install_$(variant))
 
 override_dh_auto_configure: $(foreach variant,$(VARIANTS),dh_auto_configure_$(variant))
-	sed 's%@@libexecdir@@%/usr/lib/$(DEB_HOST_MULTIARCH)%g' < debian/extra/mktirfs.in > debian/extra/mktirfs
+	sed 's%@@libexecdir@@%/usr/libexec%g' < debian/extra/mktirfs.in > debian/extra/mktirfs
 	chmod 0755 debian/extra/mktirfs
 
 override_dh_auto_clean:     $(foreach variant,$(VARIANTS),dh_auto_clean_$(variant))
-- 
2.39.5

diff -Nru tiny-initramfs-0.1/debian/changelog tiny-initramfs-0.1/debian/changelog
--- tiny-initramfs-0.1/debian/changelog	2025-01-04 21:05:00.000000000 +0100
+++ tiny-initramfs-0.1/debian/changelog	2025-01-14 02:19:24.000000000 +0100
@@ -1,3 +1,14 @@
+tiny-initramfs (0.1-6.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Adjust PKGLIBEXECDIR in mktirfs to match the move to /usr/libexec
+    implemented in the previous upload, fixing failure to copy init-static
+    (or init-debug-static in debug mode). Thanks for the report, Michael
+    Krylov!
+    Closes: #1092851
+
+ -- Cyril Brulebois <k...@debian.org>  Tue, 14 Jan 2025 02:19:24 +0100
+
 tiny-initramfs (0.1-6) unstable; urgency=medium
 
   * Team upload
diff -Nru tiny-initramfs-0.1/debian/rules tiny-initramfs-0.1/debian/rules
--- tiny-initramfs-0.1/debian/rules	2025-01-04 21:05:00.000000000 +0100
+++ tiny-initramfs-0.1/debian/rules	2025-01-14 02:11:42.000000000 +0100
@@ -27,7 +27,7 @@
 override_dh_auto_install:   $(foreach variant,$(VARIANTS),dh_auto_install_$(variant))
 
 override_dh_auto_configure: $(foreach variant,$(VARIANTS),dh_auto_configure_$(variant))
-	sed 's%@@libexecdir@@%/usr/lib/$(DEB_HOST_MULTIARCH)%g' < debian/extra/mktirfs.in > debian/extra/mktirfs
+	sed 's%@@libexecdir@@%/usr/libexec%g' < debian/extra/mktirfs.in > debian/extra/mktirfs
 	chmod 0755 debian/extra/mktirfs
 
 override_dh_auto_clean:     $(foreach variant,$(VARIANTS),dh_auto_clean_$(variant))

Attachment: signature.asc
Description: PGP signature

Reply via email to