Skip to contentSkip to conversation

More Debian packaging cleanup

PATCH In review Benjamin Drung 2 participants 9 messages Nov 14, 2017 – Nov 15, 2017 3 messages not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

cover More Debian packaging cleanup

This patch series contain some packaging clean-up.

Benjamin Drung (6):
debian: Let libibverbs1 16 break ibverbs-providers 15
debian: Replace priority extra by optional
debian: Relax dh-systemd build dependency
debian: Bump Standards-Version to 4.1.1
debian: Drop lintian overrides for false positives
debian: Run wrap-and-sort

 debian/control                         | 10 +++-------
 debian/libibumad-dev.lintian-overrides |  3 ---
 debian/libibumad3.lintian-overrides    |  2 --
 debian/libibverbs-dev.install          |  2 +-
 debian/rdma-core.install               |  2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 debian/libibumad-dev.lintian-overrides
 delete mode 100644 debian/libibumad3.lintian-overrides
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20171114200247.25890-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org

#2 lore raw

PATCH 1/6 debian: Let libibverbs1 16 break ibverbs-providers 15

ibverbs-providers uses the private symbols of libibverbs1. Thus libibverbs1 will not work with an old version version of ibverbs-providers if the private symbol version is bumped.

Bump the ibverbs-providers version that libibverbs1 breaks which was forgotten on the symbol version bump. See also commit 611b7cc3b8e0d79aa986f042f486fccc95d73679. Append a tilde to support the lower version numbers (e.g. 16~201711132208) in the PPA builds.

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
debian/control +1 -1
index c5f7a052..8c0957c7 100644
@@ -137,7 +137,7 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
 Recommends: ibverbs-providers
-Breaks: ibverbs-providers (<< 14)
+Breaks: ibverbs-providers (<< 16~)
 Description: Library for direct userspace use of RDMA (InfiniBand/iWARP)
  libibverbs is a library that allows userspace processes to use RDMA
  "verbs" as described in the InfiniBand Architecture Specification and
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20171114200247.25890-2-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org

#4 lore raw

Re: [PATCH rdma-core 1/6] debian: Let libibverbs1 16 break ibverbs-providers 15

Quoted 8 lines · Benjamin Drung

ibverbs-providers uses the private symbols of libibverbs1. Thus libibverbs1 will not work with an old version version of ibverbs-providers if the private symbol version is bumped.

Bump the ibverbs-providers version that libibverbs1 breaks which was forgotten on the symbol version bump. See also commit 611b7cc3b8e0d79aa986f042f486fccc95d73679. Append a tilde to support the lower version numbers (e.g. 16~201711132208) in the PPA builds.

This seems strange to me, we don't really need Breaks semantics here.

Shouldn't we do something like:

Package: ibverbs-providers
Depends: [..], libibverbs1 (= ${binary:Version}),

?

We really do not want to encourage mixing and matching versions.

IIRC the existing breaks is only because of how the new packages interact with the legacy ones??
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20171114203939.GT4263-uk2M96/[email protected]

#6 lore raw

Re: [PATCH rdma-core 1/6] debian: Let libibverbs1 16 break ibverbs-providers 15

Am Dienstag, den 14.11.2017, 13:39 -0700 schrieb Jason Gunthorpe:

Quoted 11 lines · Benjamin Drung
Quoted 9 lines

ibverbs-providers uses the private symbols of libibverbs1. Thus libibverbs1 will not work with an old version version of ibverbs-providers if the private symbol version is bumped.

Bump the ibverbs-providers version that libibverbs1 breaks which was
forgotten on the symbol version bump. See also commit 611b7cc3b8e0d79aa986f042f486fccc95d73679. Append a tilde to support the lower version numbers (e.g. 16~201711132208) in the PPA builds.

Quoted 8 lines

This seems strange to me, we don't really need Breaks semantics here.

Shouldn't we do something like:

Package: ibverbs-providers
Depends: [..], libibverbs1 (= ${binary:Version}),

?

We had exactly that previously and commit 611b7cc3b8e0d79aa986f042f486fccc95d73679 changed that behavior. See there for a reasoning. When building, ibverbs-provides will get an dependency on libibverbs1 (>= X) where X matches the major number from the private symbols (currently X = 16)

Quoted 1 line

We really do not want to encourage mixing and matching versions.

The current way with Breaks allows one to mix and match only within one
major release. So you could use ibverbs-provides 15.1 with libibverbs1
15 (but not with 14 or 16).

Quoted 2 lines

IIRC the existing breaks is only because of how the new packages interact with the legacy ones??

The Provides & Replaces & Breaks in ibverbs-providers are there for upgrading from the old package names to ibverbs-providers.

Signature · 18 lines
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: [email protected]
URL: https://www.profitbricks.de

Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#7 lore raw

PATCH 2/6 debian: Replace priority extra by optional

In reply to a message not in the archive

Since Debian Policy version 4.0.1, the priority extra has been deprecated.

Refer to Debian Policy Manual section 2.5 (Priorities) for details.

---
 debian/control | 4 ----
 1 file changed, 4 deletions(-)
debian/control +0 -4
index 8c0957c7..403f0527 100644
@@ -155,7 +155,6 @@ Description: Library for direct userspace use of RDMA (InfiniBand/iWARP)
 
 Package: libibverbs1-dbg
 Section: debug
-Priority: extra
 Architecture: linux-any
 Multi-Arch: same
 Depends: libibverbs1 (= ${binary:Version}), ${misc:Depends}
@@ -199,7 +198,6 @@ Description: InfiniBand Communication Manager (CM) library
 
 Package: libibcm1-dbg
 Section: debug
-Priority: extra
 Architecture: linux-any
 Depends: libibcm1 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the libibcm1 library
@@ -238,7 +236,6 @@ Description: InfiniBand Userspace Management Datagram (uMAD) library
 
 Package: libibumad3-dbg
 Section: debug
-Priority: extra
 Architecture: linux-any
 Depends: libibumad3 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the libibumad3 library
@@ -295,7 +292,6 @@ Description: Library for managing RDMA connections
 
 Package: librdmacm1-dbg
 Section: debug
-Priority: extra
 Architecture: linux-any
 Depends: librdmacm1 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the librdmacm library
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#8 lore raw

PATCH 3/6 debian: Relax dh-systemd build dependency

In reply to a message not in the archive

dh-systemd was merged into debhelper 9.20160709. Thus it does not need to be installed when debhelper is recent enough.

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
debian/control +1 -1
index 403f0527..63231b72 100644
@@ -6,7 +6,7 @@ Section: net
 Priority: optional
 Build-Depends: cmake (>= 2.8.11),
                debhelper (>= 9),
-               dh-systemd,
+               debhelper (>= 9.20160709) | dh-systemd,
                dpkg-dev (>= 1.17),
                libnl-3-dev,
                libnl-route-3-dev,
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#9 lore raw

PATCH 4/6 debian: Bump Standards-Version to 4.1.1

In reply to a message not in the archive

No changes are needed to support the new Debian policy version. See
https://www.debian.org/doc/debian-policy/ for details.

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
debian/control +1 -1
index 63231b72..0426fd2e 100644
@@ -16,7 +16,7 @@ Build-Depends: cmake (>= 2.8.11),
                pkg-config,
                python,
                valgrind [!alpha !armel !hppa !m68k !powerpcspe !sh4 !sparc64]
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
 Vcs-Git: https://github.com/linux-rdma/rdma-core.git
 Vcs-Browser: https://github.com/linux-rdma/rdma-core
 Homepage: https://github.com/linux-rdma/rdma-core
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#10 lore raw

PATCH 5/6 debian: Drop lintian overrides for false positives

In reply to a message not in the archive

lintian 2.5.59 does not complain about the false positives any more. Thus the lintian overrides can be removed.

---
 debian/libibumad-dev.lintian-overrides | 3 ---
 debian/libibumad3.lintian-overrides    | 2 --
 2 files changed, 5 deletions(-)
 delete mode 100644 debian/libibumad-dev.lintian-overrides
 delete mode 100644 debian/libibumad3.lintian-overrides
debian/libibumad-dev.lintian-overrides deleted +0 -3
deleted file mode 100644
index ed71b738..00000000
@@ -1,3 +0,0 @@
-# False positive for Certificate Authoritys (CAs)
-libibumad-dev: spelling-error-in-manpage usr/share/man/man3/umad_get_cas_names.3.gz cas case
-libibumad-dev: spelling-error-in-manpage usr/share/man/man3/umad_get_cas_names.3.gz CAs Case
debian/libibumad3.lintian-overrides deleted +0 -2
deleted file mode 100644
index cb001b96..00000000
@@ -1,2 +0,0 @@
-# False positive for Certificate Authoritys (CAs)
-libibumad3: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libibumad.so.3.0.15 cas case
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#11 lore raw

PATCH 6/6 debian: Run wrap-and-sort

In reply to a message not in the archive
---
 debian/libibverbs-dev.install | 2 +-
 debian/rdma-core.install      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
debian/libibverbs-dev.install +1 -1
index 026327ee..28995381 100644
@@ -5,8 +5,8 @@ usr/include/infiniband/mlx5dv.h
 usr/include/infiniband/opcode.h
 usr/include/infiniband/sa-kern-abi.h
 usr/include/infiniband/sa.h
-usr/include/infiniband/verbs.h
 usr/include/infiniband/tm_types.h
+usr/include/infiniband/verbs.h
 usr/lib/*/libibverbs*.so
 usr/lib/*/libmlx4.so
 usr/lib/*/libmlx5.so
debian/rdma-core.install +1 -1
index da3e73cd..93b537a1 100644
@@ -26,8 +26,8 @@ usr/sbin/rdma-ndd
 usr/share/doc/rdma-core/MAINTAINERS
 usr/share/doc/rdma-core/README.md
 usr/share/doc/rdma-core/rxe.md
-usr/share/doc/rdma-core/udev.md
 usr/share/doc/rdma-core/tag_matching.md
+usr/share/doc/rdma-core/udev.md
 usr/share/man/man5/iwpmd.conf.5
 usr/share/man/man7/rxe.7
 usr/share/man/man8/iwpmd.8
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html