Re: dpkg-maintscript-helper and usrmerge

[Michael Biebl <biebl@debian.org>]

Am 01.10.24 um 12:17 schrieb Michael Biebl:
> Am 30.09.24 um 18:53 schrieb Mark Pearson:
> > The firmware-sof-signed 2024.06 package:
> > https://packages.debian.org/trixie/firmware-sof-signed
> >
> > In particular the sof-ipc4-tplg package that is being converted from a 
> > directory to a symlink.
> >
> > The dpkg-maintscript-helper complains about /usr/lib/firmware/intel/ 
> > sof-ace-tplg (and it's contents) not being owned by the package - 
> > because they were all previously under /lib.
> >
> > > I suspect this is more of a special case, so would like to see a few
> > > more details.
> >
> > Holler if you need anything else.
>
> I test upgraded firmware-sof-signed from bookworm to trixie. The 
> bookworm chroot was usrmerged.

Ok, I see the problem now.

The issue is, that the path used in dir_to_symlink changed pre and post 
usrmove. I don't think you can express that via a .maintscript file.

The attached debdiff should do.

Regards,
Michael

diff -Nru firmware-sof-2024.06/debian/changelog firmware-sof-2024.06/debian/changelog
--- firmware-sof-2024.06/debian/changelog	2024-09-09 20:55:13.000000000 +0200
+++ firmware-sof-2024.06/debian/changelog	2024-10-01 13:18:36.000000000 +0200
@@ -1,3 +1,11 @@
+firmware-sof (2024.06-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use correct path for dir_to_symlink depending on which version we upgrade
+    from (pre and post usrmove).
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 01 Oct 2024 13:18:36 +0200
+
 firmware-sof (2024.06-1) unstable; urgency=medium
 
   * Improvements to packaging as recommended by Vincent Bernat
diff -Nru firmware-sof-2024.06/debian/firmware-sof-signed.maintscript firmware-sof-2024.06/debian/firmware-sof-signed.maintscript
--- firmware-sof-2024.06/debian/firmware-sof-signed.maintscript	2024-09-09 20:55:13.000000000 +0200
+++ firmware-sof-2024.06/debian/firmware-sof-signed.maintscript	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-
-dir_to_symlink /usr/lib/firmware/intel/sof-ace-tplg sof-ipc4-tplg 2024.06-1~
diff -Nru firmware-sof-2024.06/debian/firmware-sof-signed.postinst firmware-sof-2024.06/debian/firmware-sof-signed.postinst
--- firmware-sof-2024.06/debian/firmware-sof-signed.postinst	1970-01-01 01:00:00.000000000 +0100
+++ firmware-sof-2024.06/debian/firmware-sof-signed.postinst	2024-10-01 13:18:36.000000000 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if dpkg --compare-versions "$2" lt "2023.12.1-1.1"; then
+    FWPATH=/lib/firmware/intel/sof-ace-tplg
+else
+    FWPATH=/usr/lib/firmware/intel/sof-ace-tplg
+fi
+dpkg-maintscript-helper dir_to_symlink $FWPATH sof-ipc4-tplg "2024.06-1~" -- "$@"
+
+#DEBHELPER#
diff -Nru firmware-sof-2024.06/debian/firmware-sof-signed.postrm firmware-sof-2024.06/debian/firmware-sof-signed.postrm
--- firmware-sof-2024.06/debian/firmware-sof-signed.postrm	1970-01-01 01:00:00.000000000 +0100
+++ firmware-sof-2024.06/debian/firmware-sof-signed.postrm	2024-10-01 13:18:36.000000000 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if dpkg --compare-versions "$2" lt "2023.12.1-1.1"; then
+    FWPATH=/lib/firmware/intel/sof-ace-tplg
+else
+    FWPATH=/usr/lib/firmware/intel/sof-ace-tplg
+fi
+dpkg-maintscript-helper dir_to_symlink $FWPATH sof-ipc4-tplg "2024.06-1~" -- "$@"
+
+#DEBHELPER#
diff -Nru firmware-sof-2024.06/debian/firmware-sof-signed.preinst firmware-sof-2024.06/debian/firmware-sof-signed.preinst
--- firmware-sof-2024.06/debian/firmware-sof-signed.preinst	1970-01-01 01:00:00.000000000 +0100
+++ firmware-sof-2024.06/debian/firmware-sof-signed.preinst	2024-10-01 13:18:36.000000000 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if dpkg --compare-versions "$2" lt "2023.12.1-1.1"; then
+    FWPATH=/lib/firmware/intel/sof-ace-tplg
+else
+    FWPATH=/usr/lib/firmware/intel/sof-ace-tplg
+fi
+dpkg-maintscript-helper dir_to_symlink $FWPATH sof-ipc4-tplg "2024.06-1~" -- "$@"
+
+#DEBHELPER#
diff -Nru firmware-sof-2024.06/debian/firmware-sof-signed.prerm firmware-sof-2024.06/debian/firmware-sof-signed.prerm
--- firmware-sof-2024.06/debian/firmware-sof-signed.prerm	1970-01-01 01:00:00.000000000 +0100
+++ firmware-sof-2024.06/debian/firmware-sof-signed.prerm	2024-10-01 13:18:36.000000000 +0200
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if dpkg --compare-versions "$2" lt "2023.12.1-1.1"; then
+    FWPATH=/lib/firmware/intel/sof-ace-tplg
+else
+    FWPATH=/usr/lib/firmware/intel/sof-ace-tplg
+fi
+dpkg-maintscript-helper dir_to_symlink $FWPATH sof-ipc4-tplg "2024.06-1~" -- "$@"
+
+#DEBHELPER#

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature