Hi Cyril,
On Wed, 2021-04-28 at 17:51 +0200, Cyril Brulebois wrote:
> >
> > Why not just drop the dependency on udev and libopeniscsiusr
> entirely,
> > for the open-iscsi-udeb package ?
>
> This is not sufficient:
Please review the attached patch. I build tested locally and the
results are below. If this looks good to you, then I'll prepare an
upload and ask the release team for an unblock.
I also opted to drop the explicit udev dependency.
rrs@priyasi:.../Result$ dpkg -I open-iscsi-udeb_2.1.3-2_amd64.udeb
new Debian package, version 2.0.
size 248668 bytes: control archive=572 bytes.
592 bytes, 14 lines control
Package: open-iscsi-udeb
Source: open-iscsi
Version: 2.1.3-2
Architecture: amd64
Maintainer: Debian iSCSI Maintainers <open-iscsi@packages.debian.org>
Installed-Size: 1341
Depends: libc6-udeb (>= 2.31), libcrypto1.1-udeb (>= 1.1.1k), libisns-
udeb, libkmod2-udeb (>= 28), libmount1-udeb (>= 2.33), libsystemd0 (>=
247.3), scsi-modules
Section: debian-installer
Priority: optional
Description: Configure iSCSI
The Open-iSCSI project is a high-performance, transport independent,
multi-platform implementation of RFC3720 iSCSI.
.
This is the minimal package (udeb) used by debian-installer.
Thanks,
Ritesh
--
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
From b98d26b860ef7c989438d2641eaa5d2c514d2b51 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <rrs@debian.org>
Date: Wed, 28 Apr 2021 22:13:39 +0530
Subject: [PATCH] Make open-iscsi-udeb compatible with d-i
In this change, we add libopeniscsiusr shared object explicitly to the udeb package to
avoid any reference to the libopeniscsiusr .deb package
We also add an override in shlibs generation
This oddity, that of open-iscsi-udeb shipping a library but open-iscsi
not shipping the library, is purely in the context of debian-installer
So, let's override and instruct mkshlibs to do the requested thing
And finally,
Drop explicit dependency on libopeniscsiusr and udev
---
debian/control | 2 --
debian/rules | 6 ++++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 0a4627f..a69ce2c 100644
--- a/debian/control
+++ b/debian/control
@@ -144,8 +144,6 @@ Section: debian-installer
Package-Type: udeb
Depends: ${misc:Depends},
${shlibs:Depends},
- libopeniscsiusr,
- udev,
scsi-modules
Description: Configure iSCSI
The Open-iSCSI project is a high-performance, transport independent,
diff --git a/debian/rules b/debian/rules
index 10584dd..1152be3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,9 @@ override_dh_auto_install:
dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.start sbin/iscsi-start
dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.finish-install usr/lib/finish-install.d/10open-iscsi
+ # We do this to keep the udeb in the installer happy
+ dh_install -p open-iscsi-udeb libopeniscsiusr/libopeniscsiusr*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+
override_dh_installinit:
dh_installinit -p open-iscsi --name=iscsid
dh_installinit -p open-iscsi
@@ -96,3 +99,6 @@ override_dh_installdocs:
override_dh_missing:
dh_missing --fail-missing
+
+override_dh_makeshlibs:
+ dh_makeshlibs --add-udeb=open-iscsi-udeb
--
2.31.1
Attachment:
signature.asc
Description: This is a digitally signed message part