diff mbox

[V2,rdma-core,6/6] Bump version and update debian

Message ID 1490277329-8738-7-git-send-email-yishaih@mellanox.com (mailing list archive)
State Accepted
Headers show

Commit Message

Yishai Hadas March 23, 2017, 1:55 p.m. UTC 
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
---
 CMakeLists.txt                   | 2 +-
 debian/changelog                 | 5 ++++-
 debian/ibverbs-providers.symbols | 2 ++
 debian/libibverbs1.symbols       | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

Comments

Jason Gunthorpe March 23, 2017, 5:19 p.m. UTC | #1 
There are still more places that need updating, see

Documentation/versioning.md

Or ec419980a7890b57ceaf6fefa797a365f2f5fed3

Please follow the commit message pattern from that example..

> index 3defc05..f47fcec 100644
> +++ b/debian/changelog
> @@ -1,5 +1,8 @@
> -rdma-core (13-1) unstable; urgency=low
> +rdma-core (14-1) unstable; urgency=low
> +
> +  * Bump version.

I haven't been adding new change log entires in the past, this is just
a standin file - Debian will maintain their own in their .diff. Same
with rpm.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Leon Romanovsky March 23, 2017, 7:11 p.m. UTC | #2 
On Thu, Mar 23, 2017 at 11:19:16AM -0600, Jason Gunthorpe wrote:
> There are still more places that need updating, see
>
> Documentation/versioning.md
>
> Or ec419980a7890b57ceaf6fefa797a365f2f5fed3
>
> Please follow the commit message pattern from that example..
>
> > index 3defc05..f47fcec 100644
> > +++ b/debian/changelog
> > @@ -1,5 +1,8 @@
> > -rdma-core (13-1) unstable; urgency=low
> > +rdma-core (14-1) unstable; urgency=low
> > +
> > +  * Bump version.
>
> I haven't been adding new change log entires in the past, this is just
> a standin file - Debian will maintain their own in their .diff. Same
> with rpm.

It was more convenient for me to bump version in this file too,
so new symbols in debian/*.symbol will have more clear minimal
version (14-1), which is close to rdma-core-14.

Thanks

>
> Jason
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jason Gunthorpe March 23, 2017, 8:02 p.m. UTC | #3 
On Thu, Mar 23, 2017 at 09:11:55PM +0200, Leon Romanovsky wrote:
> > > index 3defc05..f47fcec 100644
> > > +++ b/debian/changelog
> > > @@ -1,5 +1,8 @@
> > > -rdma-core (13-1) unstable; urgency=low
> > > +rdma-core (14-1) unstable; urgency=low
> > > +
> > > +  * Bump version.
> >
> > I haven't been adding new change log entires in the past, this is just
> > a standin file - Debian will maintain their own in their .diff. Same
> > with rpm.
> 
> It was more convenient for me to bump version in this file too,
> so new symbols in debian/*.symbol will have more clear minimal
> version (14-1), which is close to rdma-core-14.

I meant, you still have to bump the version, I was just doing it in
place, because we are not actually keeping a changelog.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Leon Romanovsky March 24, 2017, 1:49 p.m. UTC | #4 
On Thu, Mar 23, 2017 at 02:02:14PM -0600, Jason Gunthorpe wrote:
> On Thu, Mar 23, 2017 at 09:11:55PM +0200, Leon Romanovsky wrote:
> > > > index 3defc05..f47fcec 100644
> > > > +++ b/debian/changelog
> > > > @@ -1,5 +1,8 @@
> > > > -rdma-core (13-1) unstable; urgency=low
> > > > +rdma-core (14-1) unstable; urgency=low
> > > > +
> > > > +  * Bump version.
> > >
> > > I haven't been adding new change log entires in the past, this is just
> > > a standin file - Debian will maintain their own in their .diff. Same
> > > with rpm.
> >
> > It was more convenient for me to bump version in this file too,
> > so new symbols in debian/*.symbol will have more clear minimal
> > version (14-1), which is close to rdma-core-14.
>
> I meant, you still have to bump the version, I was just doing it in
> place, because we are not actually keeping a changelog.

And what about 13-1 in all *.symbols files? It will need to be changed
too.
>
> Jason
Jason Gunthorpe March 24, 2017, 6:09 p.m. UTC | #5 
On Fri, Mar 24, 2017 at 04:49:05PM +0300, Leon Romanovsky wrote:
> On Thu, Mar 23, 2017 at 02:02:14PM -0600, Jason Gunthorpe wrote:
> > On Thu, Mar 23, 2017 at 09:11:55PM +0200, Leon Romanovsky wrote:
> > > > > index 3defc05..f47fcec 100644
> > > > > +++ b/debian/changelog
> > > > > @@ -1,5 +1,8 @@
> > > > > -rdma-core (13-1) unstable; urgency=low
> > > > > +rdma-core (14-1) unstable; urgency=low
> > > > > +
> > > > > +  * Bump version.
> > > >
> > > > I haven't been adding new change log entires in the past, this is just
> > > > a standin file - Debian will maintain their own in their .diff. Same
> > > > with rpm.
> > >
> > > It was more convenient for me to bump version in this file too,
> > > so new symbols in debian/*.symbol will have more clear minimal
> > > version (14-1), which is close to rdma-core-14.
> >
> > I meant, you still have to bump the version, I was just doing it in
> > place, because we are not actually keeping a changelog.
> 
> And what about 13-1 in all *.symbols files? It will need to be changed
> too.

Do you need a changelog entry to have stuff in the symbols file?

BTW, there are bad looking things in travis with this PR:

parsechangelog/debian: warning:     debian/changelog(l5): found start of entry where expected more change data or trailer
LINE: rdma-core (13-1) unstable; urgency=low
parsechangelog/debian: warning:     debian/changelog(l5): found eof
where expected more change data or trailer

 libmlx5.so.1 ibverbs-providers #MINVER#
  MLX5_1.0@MLX5_1.0 13-1
  MLX5_1.14@MLX5_1.14 14-1
+ MLX5_1.1@MLX5_1.1 14-1
+ mlx5dv_create_cq@MLX5_1.1 14-1

Etc..

https://travis-ci.org/linux-rdma/rdma-core/builds/214329236

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Leon Romanovsky March 25, 2017, 7:13 a.m. UTC | #6 
On Fri, Mar 24, 2017 at 12:09:14PM -0600, Jason Gunthorpe wrote:
> On Fri, Mar 24, 2017 at 04:49:05PM +0300, Leon Romanovsky wrote:
> > On Thu, Mar 23, 2017 at 02:02:14PM -0600, Jason Gunthorpe wrote:
> > > On Thu, Mar 23, 2017 at 09:11:55PM +0200, Leon Romanovsky wrote:
> > > > > > index 3defc05..f47fcec 100644
> > > > > > +++ b/debian/changelog
> > > > > > @@ -1,5 +1,8 @@
> > > > > > -rdma-core (13-1) unstable; urgency=low
> > > > > > +rdma-core (14-1) unstable; urgency=low
> > > > > > +
> > > > > > +  * Bump version.
> > > > >
> > > > > I haven't been adding new change log entires in the past, this is just
> > > > > a standin file - Debian will maintain their own in their .diff. Same
> > > > > with rpm.
> > > >
> > > > It was more convenient for me to bump version in this file too,
> > > > so new symbols in debian/*.symbol will have more clear minimal
> > > > version (14-1), which is close to rdma-core-14.
> > >
> > > I meant, you still have to bump the version, I was just doing it in
> > > place, because we are not actually keeping a changelog.
> >
> > And what about 13-1 in all *.symbols files? It will need to be changed
> > too.
>
> Do you need a changelog entry to have stuff in the symbols file?

I think that we need corresponding version in changelog.

If we change version to be 14-1, so all previous declarations in
ibverbs-providers.symbols will need to be updated, because version 13-1
won't exist anymore.

➜  rdma-core git:(master) cat debian/ibverbs-providers.symbols
libmlx5.so.1 ibverbs-providers #MINVER#
 MLX5_1.0@MLX5_1.0 13-1
 mlx5dv_init_obj@MLX5_1.0 13-1
 mlx5dv_query_device@MLX5_1.0 13-1

>
> BTW, there are bad looking things in travis with this PR:
>
> parsechangelog/debian: warning:     debian/changelog(l5): found start of entry where expected more change data or trailer
> LINE: rdma-core (13-1) unstable; urgency=low
> parsechangelog/debian: warning:     debian/changelog(l5): found eof
> where expected more change data or trailer
>
>  libmlx5.so.1 ibverbs-providers #MINVER#
>   MLX5_1.0@MLX5_1.0 13-1
>   MLX5_1.14@MLX5_1.14 14-1
> + MLX5_1.1@MLX5_1.1 14-1
> + mlx5dv_create_cq@MLX5_1.1 14-1
>
> Etc..

It is actual error, strange that travis passed while it was supposed to fail.

The commit https://github.com/linux-rdma/rdma-core/pull/103/commits/4ba27e66294f59db7c969bde1580e7aa8d718cd7
added MLX5_1.1, but in commit https://github.com/linux-rdma/rdma-core/pull/103/commits/9614ecdae2a6a5448cab819a057c703a570b3686
debian was updated with incorrect stanza (MLX5_1.14).

>
> https://travis-ci.org/linux-rdma/rdma-core/builds/214329236

>
> Jason
Leon Romanovsky March 25, 2017, 7:19 a.m. UTC | #7 
On Sat, Mar 25, 2017 at 10:13:26AM +0300, Leon Romanovsky wrote:
> On Fri, Mar 24, 2017 at 12:09:14PM -0600, Jason Gunthorpe wrote:
> > On Fri, Mar 24, 2017 at 04:49:05PM +0300, Leon Romanovsky wrote:
> > > On Thu, Mar 23, 2017 at 02:02:14PM -0600, Jason Gunthorpe wrote:
> > > > On Thu, Mar 23, 2017 at 09:11:55PM +0200, Leon Romanovsky wrote:
> > > > > > > index 3defc05..f47fcec 100644
> > > > > > > +++ b/debian/changelog
> > > > > > > @@ -1,5 +1,8 @@
> > > > > > > -rdma-core (13-1) unstable; urgency=low
> > > > > > > +rdma-core (14-1) unstable; urgency=low
> > > > > > > +
> > > > > > > +  * Bump version.
> > > > > >
> > > > > > I haven't been adding new change log entires in the past, this is just
> > > > > > a standin file - Debian will maintain their own in their .diff. Same
> > > > > > with rpm.
> > > > >
> > > > > It was more convenient for me to bump version in this file too,
> > > > > so new symbols in debian/*.symbol will have more clear minimal
> > > > > version (14-1), which is close to rdma-core-14.
> > > >
> > > > I meant, you still have to bump the version, I was just doing it in
> > > > place, because we are not actually keeping a changelog.
> > >
> > > And what about 13-1 in all *.symbols files? It will need to be changed
> > > too.
> >
> > Do you need a changelog entry to have stuff in the symbols file?
>
> I think that we need corresponding version in changelog.
>
> If we change version to be 14-1, so all previous declarations in
> ibverbs-providers.symbols will need to be updated, because version 13-1
> won't exist anymore.
>
> ➜  rdma-core git:(master) cat debian/ibverbs-providers.symbols
> libmlx5.so.1 ibverbs-providers #MINVER#
>  MLX5_1.0@MLX5_1.0 13-1
>  mlx5dv_init_obj@MLX5_1.0 13-1
>  mlx5dv_query_device@MLX5_1.0 13-1
>
> >
> > BTW, there are bad looking things in travis with this PR:
> >
> > parsechangelog/debian: warning:     debian/changelog(l5): found start of entry where expected more change data or trailer
> > LINE: rdma-core (13-1) unstable; urgency=low
> > parsechangelog/debian: warning:     debian/changelog(l5): found eof
> > where expected more change data or trailer
> >
> >  libmlx5.so.1 ibverbs-providers #MINVER#
> >   MLX5_1.0@MLX5_1.0 13-1
> >   MLX5_1.14@MLX5_1.14 14-1
> > + MLX5_1.1@MLX5_1.1 14-1
> > + mlx5dv_create_cq@MLX5_1.1 14-1
> >
> > Etc..
>
> It is actual error, strange that travis passed while it was supposed to fail.
>
> The commit https://github.com/linux-rdma/rdma-core/pull/103/commits/4ba27e66294f59db7c969bde1580e7aa8d718cd7
> added MLX5_1.1, but in commit https://github.com/linux-rdma/rdma-core/pull/103/commits/9614ecdae2a6a5448cab819a057c703a570b3686
> debian was updated with incorrect stanza (MLX5_1.14).

https://github.com/linux-rdma/rdma-core/pull/107

>
> >
> > https://travis-ci.org/linux-rdma/rdma-core/builds/214329236
>
> >
> > Jason
Jason Gunthorpe March 26, 2017, 8:45 p.m. UTC | #8 
On Sat, Mar 25, 2017 at 10:13:26AM +0300, Leon Romanovsky wrote:
> > Do you need a changelog entry to have stuff in the symbols file?
> 
> I think that we need corresponding version in changelog.

There are lots of counter examples..

libibverbs.so.1 libibverbs1 #MINVER#
 IBVERBS_1.0@IBVERBS_1.0 1.1.6
 IBVERBS_1.1@IBVERBS_1.1 1.1.6

Eg we do not have 1.1.6 in the changelog

> > BTW, there are bad looking things in travis with this PR:
> >
> > parsechangelog/debian: warning:     debian/changelog(l5): found start of entry where expected more change data or trailer
> > LINE: rdma-core (13-1) unstable; urgency=low
> > parsechangelog/debian: warning:     debian/changelog(l5): found eof
> > where expected more change data or trailer
> >
> >  libmlx5.so.1 ibverbs-providers #MINVER#
> >   MLX5_1.0@MLX5_1.0 13-1
> >   MLX5_1.14@MLX5_1.14 14-1
> > + MLX5_1.1@MLX5_1.1 14-1
> > + mlx5dv_create_cq@MLX5_1.1 14-1
> >
> > Etc..
> 
> It is actual error, strange that travis passed while it was supposed to fail.

Maybe we should run dpkg-shlibdeps manually and somehow fail if this
situation happens... Can you look at that?

> The commit
> https://github.com/linux-rdma/rdma-core/pull/103/commits/4ba27e66294f59db7c969bde1580e7aa8d718cd7
> added MLX5_1.1, but in commit
> https://github.com/linux-rdma/rdma-core/pull/103/commits/9614ecdae2a6a5448cab819a057c703a570b3686
> debian was updated with incorrect stanza (MLX5_1.14).

Yes, we went back and forth on this unfortunately, I gave some bad
advice.

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

Patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da80344..24542a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@  endif()
 set(PACKAGE_NAME "RDMA")
 
 # See Documentation/versioning.md
-set(PACKAGE_VERSION "13")
+set(PACKAGE_VERSION "14")
 
 #-------------------------
 # Basic standard paths
diff --git a/debian/changelog b/debian/changelog
index 3defc05..f47fcec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@ 
-rdma-core (13-1) unstable; urgency=low
+rdma-core (14-1) unstable; urgency=low
+
+  * Bump version.
 
+rdma-core (13-1) unstable; urgency=low
   * New version.
   * Adding debian/copyright.
   * Close ITP (Closes: #848971).
diff --git a/debian/ibverbs-providers.symbols b/debian/ibverbs-providers.symbols
index b114deb..9c10852 100644
--- a/debian/ibverbs-providers.symbols
+++ b/debian/ibverbs-providers.symbols
@@ -1,4 +1,6 @@ 
 libmlx5.so.1 ibverbs-providers #MINVER#
  MLX5_1.0@MLX5_1.0 13-1
+ MLX5_1.14@MLX5_1.14 14-1
  mlx5dv_init_obj@MLX5_1.0 13-1
  mlx5dv_query_device@MLX5_1.0 13-1
+ mlx5dv_create_cq@MLX5_1.14 14-1
diff --git a/debian/libibverbs1.symbols b/debian/libibverbs1.symbols
index d70afd0..b96ef46 100644
--- a/debian/libibverbs1.symbols
+++ b/debian/libibverbs1.symbols
@@ -1,7 +1,7 @@ 
 libibverbs.so.1 libibverbs1 #MINVER#
  IBVERBS_1.0@IBVERBS_1.0 1.1.6
  IBVERBS_1.1@IBVERBS_1.1 1.1.6
- (symver)IBVERBS_PRIVATE_13 13
+ (symver)IBVERBS_PRIVATE_14 14
  ibv_ack_async_event@IBVERBS_1.0 1.1.6
  ibv_ack_async_event@IBVERBS_1.1 1.1.6
  ibv_ack_cq_events@IBVERBS_1.0 1.1.6