Bug#1048139: Bug#1090984: opensm: fails to build for arch:all

[Michael Biebl]

Control: tags 1048139 + patch pending
Control: tags 1090984 + pending

Am 17.02.25 um 19:50 schrieb Michael Biebl:

I'm not the maintainer of opensm, but I've made an NMU to DELAYED/14 with the attached patch which fixes this issue.

Benjamin, if you do not agree with the changes, please holler so I can cancel them.

Please use this debdiff instead.

Regards,
Michael

diff -Nru opensm-3.3.23/debian/changelog opensm-3.3.23/debian/changelog
--- opensm-3.3.23/debian/changelog      2024-09-23 11:33:06.000000000 +0200
+++ opensm-3.3.23/debian/changelog      2025-02-17 19:32:34.000000000 +0100
@@ -1,3 +1,17 @@
+opensm (3.3.23-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Simplify installation of systemd unit files.
+    This also fixes arch:all builds. (Closes: #1090984)
+  * Rename debian/dirs to debian/opensm.dirs.
+    This makes it more obvious that the empty directory /etc/opensm, which is
+    created by that file, is supposed to be owned by the opensm binary
+    package.
+  * Add debian/clean to remove files that are not automatically cleaned up by
+    the upstream build system (Closes: #1048139)
+
+ -- Michael Biebl <bi...@debian.org>  Mon, 17 Feb 2025 19:32:34 +0100
+
 opensm (3.3.23-3) unstable; urgency=medium
 
   [ Benjamin Drung ]
diff -Nru opensm-3.3.23/debian/clean opensm-3.3.23/debian/clean
--- opensm-3.3.23/debian/clean  1970-01-01 01:00:00.000000000 +0100
+++ opensm-3.3.23/debian/clean  2025-02-17 19:32:34.000000000 +0100
@@ -0,0 +1,4 @@
+opensm/osm_qos_parser_l.c
+opensm/osm_qos_parser_y.c
+opensm/osm_qos_parser_y.h
+opensm@.service
diff -Nru opensm-3.3.23/debian/dirs opensm-3.3.23/debian/dirs
--- opensm-3.3.23/debian/dirs   2018-12-10 22:50:29.000000000 +0100
+++ opensm-3.3.23/debian/dirs   1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-etc/opensm
-usr/sbin
diff -Nru opensm-3.3.23/debian/opensm.dirs opensm-3.3.23/debian/opensm.dirs
--- opensm-3.3.23/debian/opensm.dirs    1970-01-01 01:00:00.000000000 +0100
+++ opensm-3.3.23/debian/opensm.dirs    2025-02-17 19:32:34.000000000 +0100
@@ -0,0 +1 @@
+etc/opensm
diff -Nru opensm-3.3.23/debian/opensm.install 
opensm-3.3.23/debian/opensm.install
--- opensm-3.3.23/debian/opensm.install 2024-09-23 11:13:40.000000000 +0200
+++ opensm-3.3.23/debian/opensm.install 2025-02-17 19:32:29.000000000 +0100
@@ -1,2 +1,3 @@
+usr/lib/systemd
 usr/sbin
 usr/share/man
diff -Nru opensm-3.3.23/debian/rules opensm-3.3.23/debian/rules
--- opensm-3.3.23/debian/rules  2024-09-23 11:13:40.000000000 +0200
+++ opensm-3.3.23/debian/rules  2025-02-17 19:31:23.000000000 +0100
@@ -6,9 +6,6 @@
 %:
        dh $@
 
-execute_after_dh_install:
-       dh_install -popensm $$(pkg-config --variable=systemdsystemunitdir 
systemd | sed s,^/,,)
-
 override_dh_missing:
        rm -f debian/tmp/usr/lib/*/*.la
        # Use our opensm initd script

I re-uploaded the NMU as I made another small change and also included a fix for the double-build failure. See #1048139

OpenPGP_signature.asc
Description: OpenPGP digital signature