On Thu, 23 Apr 2020 22:37:30 +0200 bi...@debian.org wrote: > Source: open-iscsi > Severity: normal > User: pkg-systemd-maintain...@lists.alioth.debian.org > Usertags: dh-systemd-removal > > Hi, > > your package open-iscsi declares a build dependency on dh-systemd. > dh-systemd was merged into debhelper in version 9.20160709 [1] and since > stretch, dh-systemd is an empty transitional package. > > For bullseye we intend to drop this empty transitional package. > > Once we drop dh-systemd, this bug report will become RC. > > Please update your package accordingly. The change should be as simple as > replacing the build dependency on dh-systemd with a build dependency on > debhelper (>= 9.20160709). > > Regards, > Michael > > [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822670 > > >
I uploaded a fix for that to DELAYED/3. It contains a bit of a hack: To make it build, I temporarily switched back to gcc-9. This is not a proper fix for #957630 but I wanted to keep the debdiff minimal (see attached) Regards, Michael
diff -Nru open-iscsi-2.0.874/debian/changelog open-iscsi-2.0.874/debian/changelog
--- open-iscsi-2.0.874/debian/changelog 2018-12-12 01:05:19.000000000 +0100
+++ open-iscsi-2.0.874/debian/changelog 2020-11-13 14:10:09.000000000 +0100
@@ -1,3 +1,12 @@
+open-iscsi (2.0.874-7.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update Build-Depends to use debhelper (>= 9.20160709) instead of
+ dh-systemd. (Closes: #958610)
+ * Temporarily switch to gcc-9 to workaround a build failure with gcc-10.
+
+ -- Michael Biebl <bi...@debian.org> Fri, 13 Nov 2020 14:10:09 +0100
+
open-iscsi (2.0.874-7.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru open-iscsi-2.0.874/debian/control open-iscsi-2.0.874/debian/control
--- open-iscsi-2.0.874/debian/control 2018-12-12 01:05:19.000000000 +0100
+++ open-iscsi-2.0.874/debian/control 2020-11-13 14:10:09.000000000 +0100
@@ -5,12 +5,12 @@
Uploaders: Ritesh Raj Sarraf <r...@debian.org>,
Christian Seiler <christ...@iwakd.de>
Build-Depends: autotools-dev,
+ gcc-9,
bison,
bzip2,
- debhelper (>= 9),
+ debhelper (>= 9.20160709),
dh-autoreconf,
dh-exec,
- dh-systemd,
dpkg-dev (>= 1.16.1~),
flex,
libisns-dev (>= 0.96-4~),
diff -Nru open-iscsi-2.0.874/debian/rules open-iscsi-2.0.874/debian/rules
--- open-iscsi-2.0.874/debian/rules 2018-12-11 19:05:42.000000000 +0100
+++ open-iscsi-2.0.874/debian/rules 2020-11-13 14:10:09.000000000 +0100
@@ -5,6 +5,10 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -DOFFLOAD_BOOT_SUPPORTED
+# This is a hack and should be removed once
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957630 has been fixed properly
+export CC = gcc-9
+
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
signature.asc
Description: This is a digitally signed message part
