On Fri, 2021-04-30 at 21:20 +0530, Ritesh Raj Sarraf wrote:
>
> How would you like to see this fixed Cyril ?
>
> The easiest option, if d-i supports, would be to extend architecture
> list to: `linux-any`, keeping it in line with what the actual open-
> iscsi package supports.
Here's what I've done. And propose.
rrs@priyasi:~/.../open-iscsi (wip/ritesh/fix-armel)$ git diff
master..HEAD
diff --git a/debian/changelog b/debian/changelog
index acfa52e..8365844 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-iscsi (2.1.3-4) unstable; urgency=medium
+
+ * [98b0d39] Add check for architectures where open-iscsi-udeb is
built
+ * [bf3d0f5] Add armel to support architecture for d-i
+
+ -- Ritesh Raj Sarraf <rrs@debian.org> Fri, 30 Apr 2021 22:07:27
+0530
+
open-iscsi (2.1.3-3) unstable; urgency=medium
* [47645a5] Make open-iscsi-udeb compatible with d-i.
diff --git a/debian/control b/debian/control
index a69ce2c..3df235f 100644
--- a/debian/control
+++ b/debian/control
@@ -139,7 +139,7 @@ Package: open-iscsi-udeb
# linux kernel udebs) must exist for these architectures - so
# check that before adding them to this list; the other
# scsi-(core|common|...)-modules are NOT sufficient!
-Architecture: amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64
ppc64el s390x
+Architecture: amd64 arm64 armel armhf i386 ia64 mips mipsel powerpc
ppc64 ppc64el s390x
Section: debian-installer
Package-Type: udeb
Depends: ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 60211b8..17ef5d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,4 +101,9 @@ override_dh_missing:
dh_missing --fail-missing
override_dh_makeshlibs:
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 ia64
mips mipsel powerpc ppc64 ppc64el s390x))
dh_makeshlibs --add-udeb=open-iscsi-udeb
+else
+ dh_makeshlibs
+endif
+
I noticed that d-i seems to have gained support for armel too. So my
proposed changes introduce support for armel. And the conditional check
also ensures to call the correct dh_makeshlibs on the respective host
architecture.
--
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
Attachment:
signature.asc
Description: This is a digitally signed message part