[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#987766: unblock: open-iscsi/2.1.3-2



Control: retitle -1 unblock: open-iscsi/2.1.3-5


Dear Release Team and Paul,

I am hopeful that this recent upload of open-iscsi at version 2.1.3-5
is proper. I request an unblock of this version so that the d-i issue
is fixed.

The patch was prepared in close co-ordination with Cyril from d-i team.

The current migration status on the tracker page looks okay to me.
The debdiff in between the versions from Testing and Unstable are
attached with this email

Thanks,
Ritesh

On Fri, 2021-05-14 at 21:56 +0200, Paul Gevers wrote:
> Hi Ritesh,
> 
> On 12-05-2021 18:27, Ritesh Raj Sarraf wrote:
> > The package has been uploaded to Unstable. It has built proper on
> > all
> > supported architectures. You may want to consider unblocking this
> > build
> > revision.
> 
> The armhf udeb package has an unmet dependency.
> 
> Paul
> 

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System
diff -Nru open-iscsi-2.1.3/debian/changelog open-iscsi-2.1.3/debian/changelog
--- open-iscsi-2.1.3/debian/changelog	2021-02-08 00:53:13.000000000 +0530
+++ open-iscsi-2.1.3/debian/changelog	2021-05-20 19:52:30.000000000 +0530
@@ -1,3 +1,26 @@
+open-iscsi (2.1.3-5) unstable; urgency=medium
+
+  [ Cyril Brulebois ]
+  * [3b8b2d8] Revert "Set architecture for build to linux-any"
+  * [1297e50] Adjust dh_auto_install and dh_makeshlibs overrides for the conditional udeb.
+
+ -- Ritesh Raj Sarraf <rrs@debian.org>  Thu, 20 May 2021 19:52:30 +0530
+
+open-iscsi (2.1.3-4) unstable; urgency=medium
+
+  * [8142984] Set architecture for build to linux-any. This ensures that the
+    library is built on the right set of architectures and dh_makeshlibs is
+    invoked appropriately. (Closes: #987858)
+
+ -- Ritesh Raj Sarraf <rrs@debian.org>  Tue, 04 May 2021 21:45:56 +0530
+
+open-iscsi (2.1.3-3) unstable; urgency=medium
+
+  * [47645a5] Make open-iscsi-udeb compatible with d-i.
+    Thanks to Cyril Brulebois (Closes: #987568)
+
+ -- Ritesh Raj Sarraf <rrs@debian.org>  Thu, 29 Apr 2021 13:43:35 +0530
+
 open-iscsi (2.1.3-2) unstable; urgency=medium
 
   * [c3b7109] Fix FTCBFS:
diff -Nru open-iscsi-2.1.3/debian/control open-iscsi-2.1.3/debian/control
--- open-iscsi-2.1.3/debian/control	2021-02-08 00:53:13.000000000 +0530
+++ open-iscsi-2.1.3/debian/control	2021-05-20 19:52:23.000000000 +0530
@@ -144,8 +144,6 @@
 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 -Nru open-iscsi-2.1.3/debian/rules open-iscsi-2.1.3/debian/rules
--- open-iscsi-2.1.3/debian/rules	2021-02-08 00:53:13.000000000 +0530
+++ open-iscsi-2.1.3/debian/rules	2021-05-20 19:52:23.000000000 +0530
@@ -9,6 +9,8 @@
 include /usr/share/dpkg/pkg-info.mk
 export KBUILD_BUILD_TIMESTAMP = @$(SOURCE_DATE_EPOCH)
 
+UDEB := $(filter open-iscsi-udeb,$(shell dh_listpackages))
+
 %:
 	dh $@
 
@@ -59,6 +61,7 @@
 	mkdir -p debian/iscsiuio/usr/share/initramfs-tools/hooks
 	cp -p debian/extra/iscsiuio.initramfs.hook debian/iscsiuio/usr/share/initramfs-tools/hooks/iscsiuio
 
+ifneq ($(UDEB),)
 	@# open-iscsi-udeb
 	dh_install -p open-iscsi-udeb usr/iscsid sbin/
 	dh_install -p open-iscsi-udeb usr/iscsistart sbin/
@@ -69,6 +72,10 @@
 	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
 
+	# Ship shared libraries along with the executable in a single udeb
+	dh_install -p open-iscsi-udeb libopeniscsiusr/libopeniscsiusr*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+endif
+
 override_dh_installinit:
 	dh_installinit -p open-iscsi --name=iscsid
 	dh_installinit -p open-iscsi
@@ -96,3 +103,10 @@
 
 override_dh_missing:
 	dh_missing --fail-missing
+
+override_dh_makeshlibs:
+ifneq ($(UDEB),)
+	dh_makeshlibs --add-udeb=open-iscsi-udeb
+else
+	dh_makeshlibs
+endif

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: