[Buildroot] [PATCH 0/4] Use a date for cvs and bump expect

[Buildroot] [PATCH 0/4] Use a date for cvs and bump expect

[Fabio Porcedda]

This patch set bump expect and in order to do that add to the cvs
script support for using a date instead of a tag.

v2:
 - add acked-by to the first patch
 - improve documentation about the date
 - use TZ=UCT to set a default time zone
 - add a patch to remove the comment at the end of the version string

Fabio Porcedda (4):
  support/download/cvs: add support to use a date instead of a tag
  manual: cvs: document that a date can be used instead of a tag
  expect: bump to version 5.45.3
  manual: don't use a comment at the end of the version variable
    assignment

 docs/manual/adding-packages-generic.txt |  4 +++-
 docs/manual/adding-packages-tips.txt    |  3 ++-
 package/expect/expect.hash              |  2 --
 package/expect/expect.mk                |  6 +++---
 support/download/cvs                    | 11 ++++++++++-
 5 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 package/expect/expect.hash

-- 
2.3.5

[Buildroot] [PATCH 1/4] support/download/cvs: add support to use a date instead of a tag

[Fabio Porcedda]

This is useful when a tag is not avaiable.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 support/download/cvs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/support/download/cvs b/support/download/cvs
index 2c3a666..9cf9304 100755
--- a/support/download/cvs
+++ b/support/download/cvs
@@ -26,7 +26,16 @@ rev="${3}"
 rawname="${4}"
 basename="${5}"
 
+if [[ ${rev} =~ ^[0-9] ]]; then
+    # Date, because a tag cannot begin with a number
+    select="-D ${rev}"
+else
+    # Tag
+    select=-"r :${rev}"
+fi
+
+export TZ=UCT
 ${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \
-       co -d "${basename}" -r ":${rev}" -P "${rawname}"
+       co -d "${basename}" "${select}" -P "${rawname}"
 
 tar czf "${output}" "${basename}"
-- 
2.3.5

[Buildroot] [PATCH 1/4] support/download/cvs: add support to use a date instead of a tag

[Arnout Vandecappelle]

On 27/04/15 01:40, Fabio Porcedda wrote:
> This is useful when a tag is not avaiable.

 Actually, we currently only support a date. The cvs co -r option has the
following syntax: -r tag[:date] - so we currently always interpret the version
as a date, since we put a : in front of it.

 The :date extension is only valid when the tag is not a tag but a branch. If
the tag is empty, it refers to the trunk.

 AFAICS, the -D option is completely equivalent to -r :date .

 I applied just the third patch of this series and could build expect successfully.


 That said, I think the current behaviour is ridiculous, so perhaps the : should
be removed from the -r handling. The : can be added explicitly in the version
number - but then the directory name of expect will be
expect-_2014-05-02 which is also a bit weird...

> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  support/download/cvs | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/support/download/cvs b/support/download/cvs
> index 2c3a666..9cf9304 100755
> --- a/support/download/cvs
> +++ b/support/download/cvs
> @@ -26,7 +26,16 @@ rev="${3}"
>  rawname="${4}"
>  basename="${5}"
>  
> +if [[ ${rev} =~ ^[0-9] ]]; then
> +    # Date, because a tag cannot begin with a number
> +    select="-D ${rev}"
> +else
> +    # Tag
> +    select=-"r :${rev}"

 Note that this won't work, since the space will be interpreted as a tag name.
It should be

	select="-r :\"${rev}\""

and remove the quotes from where ${select} is used.


 Regards,
 Arnout

> +fi
> +
> +export TZ=UCT
>  ${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \
> -       co -d "${basename}" -r ":${rev}" -P "${rawname}"
> +       co -d "${basename}" "${select}" -P "${rawname}"
>  
>  tar czf "${output}" "${basename}"
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/4] support/download/cvs: add support to use a date instead of a tag

[Fabio Porcedda]

On Sat, May 2, 2015 at 12:20 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 27/04/15 01:40, Fabio Porcedda wrote:
>> This is useful when a tag is not avaiable.
>
>  Actually, we currently only support a date. The cvs co -r option has the
> following syntax: -r tag[:date] - so we currently always interpret the version
> as a date, since we put a : in front of it.

Where have you found such documentation? I've checked the "man cvs"
but I've found only this:

  -r tag

         Use the revision specified by the tag argument ....


>  The :date extension is only valid when the tag is not a tag but a branch. If
> the tag is empty, it refers to the trunk.
>
>  AFAICS, the -D option is completely equivalent to -r :date .
>
>  I applied just the third patch of this series and could build expect successfully.

Are you sure about that? I've tried to download the source without
using this patch but it fails:

>>> expect 2014-05-02 Downloading
cvs [checkout aborted]: tag `:2014-05-02' must start with a letter
--2015-05-04 08:57:58--  http://sources.buildroot.net/expect-2014-05-02.tar.gz
Resolving sources.buildroot.net (sources.buildroot.net)... 176.9.16.109
Connecting to sources.buildroot.net
(sources.buildroot.net)|176.9.16.109|:80... connected.
HTTP request sent, awaiting response... 404 Not Found
2015-05-04 08:57:58 ERROR 404: Not Found.

>
>  That said, I think the current behaviour is ridiculous, so perhaps the : should
> be removed from the -r handling. The : can be added explicitly in the version
> number - but then the directory name of expect will be
> expect-_2014-05-02 which is also a bit weird...
>
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> ---
>>  support/download/cvs | 11 ++++++++++-
>>  1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/support/download/cvs b/support/download/cvs
>> index 2c3a666..9cf9304 100755
>> --- a/support/download/cvs
>> +++ b/support/download/cvs
>> @@ -26,7 +26,16 @@ rev="${3}"
>>  rawname="${4}"
>>  basename="${5}"
>>
>> +if [[ ${rev} =~ ^[0-9] ]]; then
>> +    # Date, because a tag cannot begin with a number
>> +    select="-D ${rev}"
>> +else
>> +    # Tag
>> +    select=-"r :${rev}"
>
>  Note that this won't work, since the space will be interpreted as a tag name.
> It should be
>
>         select="-r :\"${rev}\""
>
> and remove the quotes from where ${select} is used.
>

It fails on my pc (Fedora 22):
>>> expect expect_5_45 Downloading
rev: expect_5_45
cvs [checkout aborted]: tag `:"expect_5_45"' must start with a letter

e.g. it's works using this:
             select=-"r ${rev}"

IMHO the simplest solution is:

+if [[ ${rev} =~ ^[0-9] ]]; then
+    # Date, because a tag cannot begin with a number
+    select="-D"
+else
+    # Tag
+    select="-r"
+fi
+
+export TZ=UCT
 ${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \
-       co -d "${basename}" -r ":${rev}" -P "${rawname}"
+       co -d "${basename}" ${select} "${rev}" -P "${rawname}"

Thanks for reviewing
-- 
Fabio Porcedda

[Buildroot] [PATCH 1/4] support/download/cvs: add support to use a date instead of a tag

[Arnout Vandecappelle]

On 04/05/15 09:53, Fabio Porcedda wrote:
> On Sat, May 2, 2015 at 12:20 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 27/04/15 01:40, Fabio Porcedda wrote:
>>> This is useful when a tag is not avaiable.
>>
>>  Actually, we currently only support a date. The cvs co -r option has the
>> following syntax: -r tag[:date] - so we currently always interpret the version
>> as a date, since we put a : in front of it.
> 
> Where have you found such documentation? I've checked the "man cvs"
> but I've found only this:
> 
>   -r tag
> 
>          Use the revision specified by the tag argument ....

 I guess my Debian sid has a different cvs version. Mine is
1.12.13-MirDebian-11 - which seems to indicate that there could be some
Debian-specific patches in there.

 So this means that the current code simply doesn't work at all for you, right?

> 
> 
>>  The :date extension is only valid when the tag is not a tag but a branch. If
>> the tag is empty, it refers to the trunk.
>>
>>  AFAICS, the -D option is completely equivalent to -r :date .
>>
>>  I applied just the third patch of this series and could build expect successfully.
> 
> Are you sure about that? I've tried to download the source without
> using this patch but it fails:

 Yes I'm sure,

[snip]
>>> +if [[ ${rev} =~ ^[0-9] ]]; then
>>> +    # Date, because a tag cannot begin with a number
>>> +    select="-D ${rev}"
>>> +else
>>> +    # Tag
>>> +    select=-"r :${rev}"
>>
>>  Note that this won't work, since the space will be interpreted as a tag name.
>> It should be
>>
>>         select="-r :\"${rev}\""
>>
>> and remove the quotes from where ${select} is used.
>>
> 
> It fails on my pc (Fedora 22):
>>>> expect expect_5_45 Downloading
> rev: expect_5_45
> cvs [checkout aborted]: tag `:"expect_5_45"' must start with a letter

 Which kind of proves my point - the current situation doesn't work on F22.

> 
> e.g. it's works using this:
>              select=-"r ${rev}"
> 
> IMHO the simplest solution is:
> 
> +if [[ ${rev} =~ ^[0-9] ]]; then
> +    # Date, because a tag cannot begin with a number
> +    select="-D"
> +else
> +    # Tag
> +    select="-r"
> +fi
> +
> +export TZ=UCT

 Small nit: UCT is correct, but I see more people use UTC (which is also what
e.g. LANG=C date -u prints) so let's stick to that.

>  ${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \
> -       co -d "${basename}" -r ":${rev}" -P "${rawname}"
> +       co -d "${basename}" ${select} "${rev}" -P "${rawname}"

 Looks good to me. Will you cook up a proper patch?

 It would be nice if it would be possible to give _both_ a branch and a date,
but that is probably pushing it a little - especially for a VCS that is almost
dead...


 Regards,
 Arnout

> 
> Thanks for reviewing
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/4] support/download/cvs: add support to use a date instead of a tag

[Fabio Porcedda]

On Mon, May 4, 2015 at 6:47 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 04/05/15 09:53, Fabio Porcedda wrote:
>> On Sat, May 2, 2015 at 12:20 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
>>> On 27/04/15 01:40, Fabio Porcedda wrote:
>>>> This is useful when a tag is not avaiable.
>>>
>>>  Actually, we currently only support a date. The cvs co -r option has the
>>> following syntax: -r tag[:date] - so we currently always interpret the version
>>> as a date, since we put a : in front of it.
>>
>> Where have you found such documentation? I've checked the "man cvs"
>> but I've found only this:
>>
>>   -r tag
>>
>>          Use the revision specified by the tag argument ....
>
>  I guess my Debian sid has a different cvs version. Mine is
> 1.12.13-MirDebian-11 - which seems to indicate that there could be some
> Debian-specific patches in there.
>
>  So this means that the current code simply doesn't work at all for you, right?
>
>>
>>
>>>  The :date extension is only valid when the tag is not a tag but a branch. If
>>> the tag is empty, it refers to the trunk.
>>>
>>>  AFAICS, the -D option is completely equivalent to -r :date .
>>>
>>>  I applied just the third patch of this series and could build expect successfully.
>>
>> Are you sure about that? I've tried to download the source without
>> using this patch but it fails:
>
>  Yes I'm sure,
>
> [snip]
>>>> +if [[ ${rev} =~ ^[0-9] ]]; then
>>>> +    # Date, because a tag cannot begin with a number
>>>> +    select="-D ${rev}"
>>>> +else
>>>> +    # Tag
>>>> +    select=-"r :${rev}"
>>>
>>>  Note that this won't work, since the space will be interpreted as a tag name.
>>> It should be
>>>
>>>         select="-r :\"${rev}\""
>>>
>>> and remove the quotes from where ${select} is used.
>>>
>>
>> It fails on my pc (Fedora 22):
>>>>> expect expect_5_45 Downloading
>> rev: expect_5_45
>> cvs [checkout aborted]: tag `:"expect_5_45"' must start with a letter
>
>  Which kind of proves my point - the current situation doesn't work on F22.
>
>>
>> e.g. it's works using this:
>>              select=-"r ${rev}"
>>
>> IMHO the simplest solution is:
>>
>> +if [[ ${rev} =~ ^[0-9] ]]; then
>> +    # Date, because a tag cannot begin with a number
>> +    select="-D"
>> +else
>> +    # Tag
>> +    select="-r"
>> +fi
>> +
>> +export TZ=UCT
>
>  Small nit: UCT is correct, but I see more people use UTC (which is also what
> e.g. LANG=C date -u prints) so let's stick to that.

OK

>>  ${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \
>> -       co -d "${basename}" -r ":${rev}" -P "${rawname}"
>> +       co -d "${basename}" ${select} "${rev}" -P "${rawname}"
>
>  Looks good to me. Will you cook up a proper patch?

Sure

>  It would be nice if it would be possible to give _both_ a branch and a date,
> but that is probably pushing it a little - especially for a VCS that is almost
> dead...

Using a branch just works because the "-r" option accept a tag or a
branch, maybe i update the documentation.

BR
-- 
Fabio Porcedda

[Buildroot] [PATCH 2/4] manual: cvs: document that a date can be used instead of a tag

[Fabio Porcedda]

Also instead of using the generic word "timestamp" use the word "tag".

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
 docs/manual/adding-packages-generic.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 8cf6bb6..23c2578 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -280,7 +280,9 @@ information is (assuming the package name is +libfoo+) :
      Only anonymous pserver mode is supported.
      +LIBFOO_SITE+ 'must' contain the source URL as well as the remote
      repository directory. The module is the package name.
-     +LIBFOO_VERSION+ is 'mandatory' and 'must' be a timestamp.
+     +LIBFOO_VERSION+ is 'mandatory' and 'must' be a tag or a date
+     (e.g. "2014-10-20", "2014-10-20 13:45", "2014-10-20 13:45+01:00"
+     see "man cvs" for further details).
   ** +git+ for retrieving source code from a Git repository. Used by
      default when +LIBFOO_SITE+ begins with +git://+. The downloaded
      source code is cached as with the +svn+
-- 
2.3.5

[Buildroot] [PATCH 3/4] expect: bump to version 5.45.3

[Fabio Porcedda]

Download it from the cvs repository because it is not avaialbe as a
downloadable file.
Also because a tag isn't avaiable use the date.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
 package/expect/expect.hash | 2 --
 package/expect/expect.mk   | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 package/expect/expect.hash

diff --git a/package/expect/expect.hash b/package/expect/expect.hash
deleted file mode 100644
index 09e68e7..0000000
--- a/package/expect/expect.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed:
-sha256  b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040  expect5.45.tar.gz
diff --git a/package/expect/expect.mk b/package/expect/expect.mk
index 8ef7e90..d78ff6c 100644
--- a/package/expect/expect.mk
+++ b/package/expect/expect.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-EXPECT_VERSION = 5.45
-EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
-EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)
+# Version 5.45.3
+EXPECT_VERSION = 2014-05-02
+EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect
 EXPECT_LICENSE = Public domain
 EXPECT_LICENSE_FILES = README
 
-- 
2.3.5

[Buildroot] [PATCH 3/4] expect: bump to version 5.45.3

[Arnout Vandecappelle]

On 27/04/15 01:40, Fabio Porcedda wrote:
> Download it from the cvs repository because it is not avaialbe as a
                                                        available

> downloadable file.
> Also because a tag isn't avaiable use the date.
                           available

> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Note that this can be applied without patch 1/3.

 Regards,
 Arnout

> ---
>  package/expect/expect.hash | 2 --
>  package/expect/expect.mk   | 6 +++---
>  2 files changed, 3 insertions(+), 5 deletions(-)
>  delete mode 100644 package/expect/expect.hash
> 
> diff --git a/package/expect/expect.hash b/package/expect/expect.hash
> deleted file mode 100644
> index 09e68e7..0000000
> --- a/package/expect/expect.hash
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -# Locally computed:
> -sha256  b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040  expect5.45.tar.gz
> diff --git a/package/expect/expect.mk b/package/expect/expect.mk
> index 8ef7e90..d78ff6c 100644
> --- a/package/expect/expect.mk
> +++ b/package/expect/expect.mk
> @@ -4,9 +4,9 @@
>  #
>  ################################################################################
>  
> -EXPECT_VERSION = 5.45
> -EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
> -EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)
> +# Version 5.45.3
> +EXPECT_VERSION = 2014-05-02
> +EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect
>  EXPECT_LICENSE = Public domain
>  EXPECT_LICENSE_FILES = README
>  
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 4/4] manual: don't use a comment at the end of the version variable assignment

[Fabio Porcedda]

The comment at the end of the version string assigment could lead to a download
failure so don't use it as a example.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Reported-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 docs/manual/adding-packages-tips.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 6f5e785..6699951 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -42,7 +42,8 @@ on GitHub. As GitHub is known to have changed download mechanisms in the
 past, the 'github' helper function should be used as shown below.
 
 ------------------------
-FOO_VERSION = v1.0 # tag or full commit ID
+# Use a tag or a full commit ID
+FOO_VERSION = v1.0
 FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION))
 ------------------------
 
-- 
2.3.5

[Buildroot] [PATCH 4/4] manual: don't use a comment at the end of the version variable assignment

[Thomas Petazzoni]

Dear Fabio Porcedda,

On Mon, 27 Apr 2015 01:40:21 +0200, Fabio Porcedda wrote:
> The comment at the end of the version string assigment could lead to a download
> failure so don't use it as a example.
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Reported-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
>  docs/manual/adding-packages-tips.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com