[PATCH] bitbake.conf: only use wget --no-check-certificate if the user's wget supports it.

[PATCH] bitbake.conf: only use wget --no-check-certificate if the user's wget supports it.

[Chris Larson]

Signed-off-by: Chris Larson <clarson@mvista.com>
---
 conf/bitbake.conf |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 077e8e1..fc1f550 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -523,18 +523,19 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
 #     into your local.conf
 
+__wget_nocheck = "${@['--no-check-certificate', ''][bool(os.popen3('wget --no-check-certificate')[2].read())]}"
 FETCHCMD_svn = "/usr/bin/env svn"
 FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 5 --no-check-certificate"
+FETCHCMD_wget = "/usr/bin/env wget -t 5 ${__wget_nocheck}"
 FETCHCMD_bzr = "/usr/bin/env bzr"
 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_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp ${__wget_nocheck} -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_nocheck} -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}"
-- 
1.6.0

Re: [PATCH] bitbake.conf: only use wget --no-check-certificate if the user's wget supports it.

[Christopher Larson]

Per pb_, should change __wget_nocheck to a := to avoid numerous  
executions of the test.

On Jun 17, 2009, at 8:51 AM, Chris Larson wrote:

> Signed-off-by: Chris Larson <clarson@mvista.com>
> ---
> conf/bitbake.conf |    7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index 077e8e1..fc1f550 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -523,18 +523,19 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases 
> "
> #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
> #     into your local.conf
>
> +__wget_nocheck = "${@['--no-check-certificate', ''] 
> [bool(os.popen3('wget --no-check-certificate')[2].read())]}"
> FETCHCMD_svn = "/usr/bin/env svn"
> FETCHCMD_cvs = "/usr/bin/env cvs"
> -FETCHCMD_wget = "/usr/bin/env wget -t 5 --no-check-certificate"
> +FETCHCMD_wget = "/usr/bin/env wget -t 5 ${__wget_nocheck}"
> FETCHCMD_bzr = "/usr/bin/env bzr"
> 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_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 -- 
> passive-ftp ${__wget_nocheck} -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_nocheck} -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}"
> -- 
> 1.6.0
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Chris Larson
Software Engineer
MontaVista Software, Inc.
Email: clarson AT mvista DOT com
Email: clarson AT kergoth DOT com