Patchwork [1,of,7,STABLE] builddeb: use codename in version

login
register
mail settings
Submitter Sean Farley
Date May 1, 2016, 7:12 a.m.
Message ID <8989df4c49c34a88be35.1462086721@laptop.local>
Download mbox | patch
Permalink /patch/14851/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Sean Farley - May 1, 2016, 7:12 a.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1462042305 25200
#      Sat Apr 30 11:51:45 2016 -0700
# Branch stable
# Node ID 8989df4c49c34a88be3569f1e0e82a06c6b9a39b
# Parent  cbf282da720ac907b492a2b1045288130d6d166e
# EXP-Topic docker-ppa
builddeb: use codename in version

Apparently, this is needed to allow ppas to be built for multiple distros.
Yuya Nishihara - May 1, 2016, 9:18 a.m.
On Sun, 01 May 2016 00:12:01 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1462042305 25200
> #      Sat Apr 30 11:51:45 2016 -0700
> # Branch stable
> # Node ID 8989df4c49c34a88be3569f1e0e82a06c6b9a39b
> # Parent  cbf282da720ac907b492a2b1045288130d6d166e
> # EXP-Topic docker-ppa
> builddeb: use codename in version
> 
> Apparently, this is needed to allow ppas to be built for multiple distros.
> 
> diff --git a/contrib/builddeb b/contrib/builddeb
> --- a/contrib/builddeb
> +++ b/contrib/builddeb
> @@ -55,11 +55,11 @@ gethgversion
>  debver="$version"
>  if [ -n "$type" ] ; then
>      debver="$debver~$type"
>  fi
>  if [ -n "$distance" ] ; then
> -    debver="$debver+$distance-$node"
> +    debver="$debver+$distance-$CODENAME-$node"

I don't know how ppa versions work, but appending arbitrary text after
number should be okay.

Pushed the patches 1-3 and 6 to the committed repo, thanks.
Sean Farley - May 1, 2016, 5:52 p.m.
Yuya Nishihara <yuya@tcha.org> writes:

> On Sun, 01 May 2016 00:12:01 -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean@farley.io>
>> # Date 1462042305 25200
>> #      Sat Apr 30 11:51:45 2016 -0700
>> # Branch stable
>> # Node ID 8989df4c49c34a88be3569f1e0e82a06c6b9a39b
>> # Parent  cbf282da720ac907b492a2b1045288130d6d166e
>> # EXP-Topic docker-ppa
>> builddeb: use codename in version
>> 
>> Apparently, this is needed to allow ppas to be built for multiple distros.
>> 
>> diff --git a/contrib/builddeb b/contrib/builddeb
>> --- a/contrib/builddeb
>> +++ b/contrib/builddeb
>> @@ -55,11 +55,11 @@ gethgversion
>>  debver="$version"
>>  if [ -n "$type" ] ; then
>>      debver="$debver~$type"
>>  fi
>>  if [ -n "$distance" ] ; then
>> -    debver="$debver+$distance-$node"
>> +    debver="$debver+$distance-$CODENAME-$node"
>
> I don't know how ppa versions work, but appending arbitrary text after
> number should be okay.

Do you mean that you agree with what this patch does or something else?
Yuya Nishihara - May 2, 2016, 1:41 a.m.
On Sun, 01 May 2016 10:52:05 -0700, Sean Farley wrote:
> Yuya Nishihara <yuya@tcha.org> writes:
> 
> > On Sun, 01 May 2016 00:12:01 -0700, Sean Farley wrote:  
> >> # HG changeset patch
> >> # User Sean Farley <sean@farley.io>
> >> # Date 1462042305 25200
> >> #      Sat Apr 30 11:51:45 2016 -0700
> >> # Branch stable
> >> # Node ID 8989df4c49c34a88be3569f1e0e82a06c6b9a39b
> >> # Parent  cbf282da720ac907b492a2b1045288130d6d166e
> >> # EXP-Topic docker-ppa
> >> builddeb: use codename in version
> >> 
> >> Apparently, this is needed to allow ppas to be built for multiple distros.
> >> 
> >> diff --git a/contrib/builddeb b/contrib/builddeb
> >> --- a/contrib/builddeb
> >> +++ b/contrib/builddeb
> >> @@ -55,11 +55,11 @@ gethgversion
> >>  debver="$version"
> >>  if [ -n "$type" ] ; then
> >>      debver="$debver~$type"
> >>  fi
> >>  if [ -n "$distance" ] ; then
> >> -    debver="$debver+$distance-$node"
> >> +    debver="$debver+$distance-$CODENAME-$node"  
> >
> > I don't know how ppa versions work, but appending arbitrary text after
> > number should be okay.  
> 
> Do you mean that you agree with what this patch does or something else?

This change seems fine.

I don't know why $CODENAME is necessary for PPAs, but "$debver+$distance"
should have unique number necessary for version comparison, so it doesn't
matter for non-PPAs.

Patch

diff --git a/contrib/builddeb b/contrib/builddeb
--- a/contrib/builddeb
+++ b/contrib/builddeb
@@ -55,11 +55,11 @@  gethgversion
 debver="$version"
 if [ -n "$type" ] ; then
     debver="$debver~$type"
 fi
 if [ -n "$distance" ] ; then
-    debver="$debver+$distance-$node"
+    debver="$debver+$distance-$CODENAME-$node"
 fi
 
 control=debian/control
 changelog=debian/changelog