[PATCH rdma-core 0/2] Debian packaging changes for 15-2

[PATCH rdma-core 0/2] Debian packaging changes for 15-2

[Benjamin Drung]

In addition to my previous set of packaging changes, here are the remaining
changes from my rdma-core 15-2 upload to Debian unstable. Let's see if
rdma-core builds now on all architectures. Build log overview:
https://buildd.debian.org/status/package.php?p=rdma-core

In addition, I added myself to MAINTAINERS.

Benjamin Drung (2):
  debian: Don't install disabled providers on archs that miss coherent
    DMA
  Add myself as Debian packaging maintainer

 MAINTAINERS  |  5 +++++
 debian/rules | 12 ++++++++++++
 2 files changed, 17 insertions(+)

-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH rdma-core 1/2] debian: Don't install disabled providers on archs that miss coherent DMA

[Benjamin Drung]

The ibverbs providers mlx4 and mlx5 require cache coherent DMA which is
not available on all architectures. Therefore do not try to install them
on the affected architectures.

Closes: #881731
Signed-off-by: Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
---
 debian/rules | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/rules b/debian/rules
index 562fff51..b0fbe1d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,17 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+NO_COHERENT_DMA_ARCHS = armel armhf mips mips64el mipsel
+
 %:
 	dh $@ --with systemd --builddirectory=build-deb
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build-deb
+	for package in ibverbs-providers libibverbs-dev rdma-core; do \
+		test ! -e debian/$$package.install.backup || mv debian/$$package.install.backup debian/$$package.install; \
+	done
 
 # Upstream wishes to use CMAKE_BUILD_TYPE=Release, and ensures that has a
 # sensible basis of options (eg no -O3, including -g). Debian specific options
@@ -34,6 +39,13 @@ override_dh_auto_build:
 override_dh_auto_test:
 
 override_dh_auto_install:
+# Some providers are disabled on architectures that are not able to do coherent DMA
+ifeq (,$(filter-out $(NO_COHERENT_DMA_ARCHS),$(DEB_HOST_ARCH)))
+	for package in ibverbs-providers libibverbs-dev rdma-core; do \
+		test -e debian/$$package.install.backup || cp debian/$$package.install debian/$$package.install.backup; \
+	done
+	sed -i '/mlx[45]/d' debian/ibverbs-providers.install debian/libibverbs-dev.install debian/rdma-core.install
+endif
 	DESTDIR=$(CURDIR)/debian/tmp ninja -C build-deb install
 
 # The following files are not used on Debian (we ship our own sysvinit script)
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH rdma-core 2/2] Add myself as Debian packaging maintainer

[Benjamin Drung]

Signed-off-by: Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
---
 MAINTAINERS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 08286cb5..194a2da0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -40,6 +40,11 @@ F:	*/CMakeLists.txt
 F:	*/lib*.map
 F:	buildlib/
 
+DEBIAN PACKAGING
+M:	Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
+S:	Supported
+F:	debian/
+
 BNXT_RE USERSPACE PROVIDER (for bnxt_re.ko)
 M:	Devesh Sharma  <Devesh.sharma-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
 S:	Supported
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH rdma-core 0/2] Debian packaging changes for 15-2

[Leon Romanovsky]

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

On Thu, Nov 16, 2017 at 01:29:35PM +0100, Benjamin Drung wrote:
> In addition to my previous set of packaging changes, here are the remaining
> changes from my rdma-core 15-2 upload to Debian unstable. Let's see if
> rdma-core builds now on all architectures. Build log overview:
> https://buildd.debian.org/status/package.php?p=rdma-core
>
> In addition, I added myself to MAINTAINERS.
>
> Benjamin Drung (2):
>   debian: Don't install disabled providers on archs that miss coherent
>     DMA
>   Add myself as Debian packaging maintainer
>
>  MAINTAINERS  |  5 +++++
>  debian/rules | 12 ++++++++++++
>  2 files changed, 17 insertions(+)
>

Thanks, merged.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]