summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoao Mano <joao@datacom.ind.br>2016-01-15 18:13:15 -0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-01-20 23:26:03 +0100
commit4fad12598df593d58fa36d40a1002c4a3a130b7a (patch)
tree81f920e9a529685566db5a0bd5aaa5865379166a
parent544e2c5871f223facd1ab3c2853cd07ad70dd9d1 (diff)
downloadbuildroot-4fad12598df593d58fa36d40a1002c4a3a130b7a.tar.gz
buildroot-4fad12598df593d58fa36d40a1002c4a3a130b7a.zip
support/download: alternative access methods to CVS
Allows user to specify other access methods than :pserver:anonymous@ on CVS repositories. This shall be defined in the <pkg>_SITE variable. [Thomas: - as suggested by Yann, quote the variable expansion - as suggested by Yann, use a regexp match - tweak commit log] Signed-off-by: Joao Mano <joao@datacom.ind.br> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--docs/manual/adding-packages-generic.txt7
-rwxr-xr-xsupport/download/cvs8
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 1c25c4e9f7..1f9c7bbe95 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -279,7 +279,12 @@ information is (assuming the package name is +libfoo+) :
** +cvs+ for retrieving source code from a CVS repository.
Used by default when +LIBFOO_SITE+ begins with +cvs://+.
The downloaded source code is cached as with the +svn+ method.
- Only anonymous pserver mode is supported.
+ Anonymous pserver mode is assumed otherwise explicitly defined
+ on +LIBFOO_SITE+. Both
+ +LIBFOO_SITE=cvs://libfoo.net:/cvsroot/libfoo+ and
+ +LIBFOO_SITE=cvs://:ext:libfoo.net:/cvsroot/libfoo+
+ are accepted, on the former anonymous pserver access mode is
+ assumed.
+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 tag, a branch, or
diff --git a/support/download/cvs b/support/download/cvs
index e1d5035c11..7980389a4e 100755
--- a/support/download/cvs
+++ b/support/download/cvs
@@ -40,8 +40,14 @@ else
select="-r"
fi
+# The absence of an initial : on ${repo} means access method undefined
+if [[ ! "${repo}" =~ ^: ]]; then
+ # defaults to anonymous pserver
+ repo=":pserver:anonymous@${repo}"
+fi
+
export TZ=UTC
-_cvs ${verbose} -z3 -d"':pserver:anonymous@${repo}'" \
+_cvs ${verbose} -z3 -d"'${repo}'" \
co -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'"
tar czf "${output}" "${basename}"
OpenPOWER on IntegriCloud