diff options
-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)}" |