From 51be1880631435627e8ff490d71b024c2683244a Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Wed, 2 Nov 2016 13:42:01 -0600 Subject: oeqa/utils: {Target,SDK,}BuildProject remove dependency of bb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't use bitbake references inside utils modules, in order todo that changes getVar calls for arguments in the __init__ method like dl_dir for all the classes and testlogdir, builddatetime in SDKBUildProject. Also don't export proxies inside _download_archive method, a good practice is to setup the proxies at init of the process instead of do it in this helper module. [YOCTO #10231] [YOCTO #10599] (From OE-Core rev: 581c34d1efe9839f50ef322761269b4e4d8a56a6) Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/buildproject.py | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'meta/lib/oeqa/utils') diff --git a/meta/lib/oeqa/utils/buildproject.py b/meta/lib/oeqa/utils/buildproject.py index 1ed9624a76..386a927881 100644 --- a/meta/lib/oeqa/utils/buildproject.py +++ b/meta/lib/oeqa/utils/buildproject.py @@ -6,17 +6,17 @@ import os import re -import bb.utils import subprocess +import shutil + from abc import ABCMeta, abstractmethod class BuildProject(metaclass=ABCMeta): - - def __init__(self, d, uri, foldername=None, tmpdir="/tmp/"): - self.d = d + def __init__(self, uri, foldername=None, tmpdir="/tmp/", dl_dir=None): self.uri = uri self.archive = os.path.basename(uri) self.localarchive = os.path.join(tmpdir,self.archive) + self.dl_dir = dl_dir if foldername: self.fname = foldername else: @@ -24,27 +24,11 @@ class BuildProject(metaclass=ABCMeta): # Download self.archive to self.localarchive def _download_archive(self): - - dl_dir = self.d.getVar("DL_DIR") - if dl_dir and os.path.exists(os.path.join(dl_dir, self.archive)): - bb.utils.copyfile(os.path.join(dl_dir, self.archive), self.localarchive) + if self.dl_dir and os.path.exists(os.path.join(self.dl_dir, self.archive)): + shutil.copyfile(os.path.join(self.dl_dir, self.archive), self.localarchive) return - 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) - if val: - cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd) - - cmd = cmd + "wget -O %s %s" % (self.localarchive, self.uri) + cmd = "wget -O %s %s" % (self.localarchive, self.uri) subprocess.check_call(cmd, shell=True) # This method should provide a way to run a command in the desired environment. @@ -66,4 +50,3 @@ class BuildProject(metaclass=ABCMeta): def clean(self): self._run('rm -rf %s' % self.targetdir) subprocess.call('rm -f %s' % self.localarchive, shell=True) - pass -- cgit v1.2.3-54-g00ecf