sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

oeqa/utils: targetbuild: take proxy into account 

A previous commit broke downloads
when proxies are involved, let's fix it.

(From OE-Core rev: 97e263b99cbe8184a74f80738fd471cfdef29e0c)

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Stanacar 2014-02-09 12:39:30 +02:00 committed by Richard Purdie
parent 2bdc00fe74
commit 6d0f1d30d4
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/lib/oeqa/runtime/buildcvs.py
View File

@ -10,7 +10,7 @@ class BuildCvsTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
self.project = TargetBuildProject(oeRuntimeTest.tc.target,
self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d,
"http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2")
self.project.download_archive()

2
meta/lib/oeqa/runtime/buildiptables.py
View File

@ -10,7 +10,7 @@ class BuildIptablesTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
self.project = TargetBuildProject(oeRuntimeTest.tc.target,
self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d,
"http://netfilter.org/projects/iptables/files/iptables-1.4.13.tar.bz2")
self.project.download_archive()

2
meta/lib/oeqa/runtime/buildsudoku.py
View File

@ -10,7 +10,7 @@ class SudokuTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
self.project = TargetBuildProject(oeRuntimeTest.tc.target,
self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d,
"http://downloads.sourceforge.net/project/sudoku-savant/sudoku-savant/sudoku-savant-1.3/sudoku-savant-1.3.tar.bz2")
self.project.download_archive()

20
meta/lib/oeqa/utils/targetbuild.py
View File

@ -11,8 +11,9 @@ import subprocess
class TargetBuildProject():
def __init__(self, target, uri, foldername=None):
def __init__(self, target, d, uri, foldername=None):
self.target = target
self.d = d
self.uri = uri
self.targetdir = "~/"
self.archive = os.path.basename(uri)
@ -23,7 +24,22 @@ class TargetBuildProject():
def download_archive(self):
subprocess.check_call("wget -O %s %s" % (self.localarchive, self.uri), shell=True)
exportvars = ['HTTP_PROXY', 'http_proxy',
'HTTPS_PROXY', 'https_proxy',
'FTP_PROXY', 'ftp_proxy',
'FTPS_PROXY', 'ftps_proxy',
'NO_PROXY', 'no_proxy',
'ALL_PROXY', 'all_proxy',
'SOCKS5_USER', 'SOCKS5_PASSWD']
cmd = ''
for var in exportvars:
val = self.d.getVar(var, True)
if val:
cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)
cmd = cmd + "wget -O %s %s" % (self.localarchive, self.uri)
subprocess.check_call(cmd, shell=True)
(status, output) = self.target.copy_to(self.localarchive, self.targetdir)
if status != 0: