aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <clarson@mvista.com>2009-08-19 17:24:40 +0000
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-01-28 14:20:22 +0100
commita592221d473c00362bd1264d92d432c8b8ceebb8 (patch)
tree098055409487567d6bcdef4109201ce2bafc0eb7
parent71b8eabfe17a08f8f55d01b1e34a3193cb269609 (diff)
downloadopenembedded-a592221d473c00362bd1264d92d432c8b8ceebb8.tar.gz
bitbake.conf: only pass --no-check-certificate if wget supports it.
Signed-off-by: Chris Larson <clarson@mvista.com>
-rw-r--r--conf/bitbake.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3a68959c6c..fa5d112cbc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -561,12 +561,13 @@ FETCHCMD_wget = "/usr/bin/env wget -t 5 --no-check-certificate"
FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCMD_hg = "/usr/bin/env hg"
+__wget_nocheckcert := "${@['--no-check-certificate', '']['unrecognized option' in os.popen3("wget --no-check-certificate")[2].read()]}"
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_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp ${__wget_nocheckcert} -P ${DL_DIR} ${URI}"
FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${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}"
+RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp ${__wget_nocheckcert} -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 ${SVNCOOPTS}"