diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-05 10:21:18 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-05 10:55:22 +0200 |
| commit | ddc5b66ddc0b5475644d4e589d915c6afd540be7 (patch) | |
| tree | d232325936ffd0fdfffa95be8aae7ada4e165f05 /conf | |
| parent | 24a990c800d8b690f0ef187162dd5a9990cab865 (diff) | |
bitbake.conf: subversion cmds, remove --trust-server-cert and add --force, --accept
* --trust-server-cert is supported only in >=svn-1.6
http://subversion.apache.org/docs/release-notes/1.6.html
* --force allows to overwrite existing dirs
ie
matchbox-panel-2-icon-themes_0.0.1.bb
matchbox-panel-2_svn.bb
are checkouting/updating tiwo different SRCREVs and every few builds
you end up removing svn checkout from downloads dir, just because it
refuses to upgrade to newer revision (applets dir already exists there).
* --accept to overwrite any local modifications (as we want clean checkout)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 43d631764d..abe500a099 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -553,7 +553,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" # into your local.conf -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert" +FETCHCMD_svn = "/usr/bin/env svn --non-interactive" FETCHCMD_cvs = "/usr/bin/env cvs" FETCHCMD_wget = "/usr/bin/env wget -t 5 --no-check-certificate" FETCHCMD_bzr = "/usr/bin/env bzr" @@ -562,12 +562,12 @@ FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" -FETCHCOMMAND_svn = "/usr/bin/env svn co --non-interactive --trust-server-cert ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" +FETCHCOMMAND_svn = "/usr/bin/env svn co --non-interactive ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" RESUMECOMMAND = "ERROR, this must be a BitBake bug" RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" -UPDATECOMMAND_svn = "/usr/bin/env svn update --non-interactive --trust-server-cert ${SVNCOOPTS}" +UPDATECOMMAND_svn = "/usr/bin/env svn update --non-interactive --force --accept theirs-full ${SVNCOOPTS}" SRCDATE = "${DATE}" SRCREV = "1" SRCPV = "${@bb.fetch.get_srcrev(d)}" |