mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
oeqa/utils: {Target,SDK,}BuildProject remove dependency of bb
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 <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
72e9ae377d
commit
51be188063
@@ -5,13 +5,13 @@ from oeqa.utils.buildproject import BuildProject
|
||||
|
||||
class TargetBuildProject(BuildProject):
|
||||
|
||||
def __init__(self, target, d, uri, foldername=None):
|
||||
def __init__(self, target, uri, foldername=None, dl_dir=None):
|
||||
self.target = target
|
||||
self.targetdir = "~/"
|
||||
BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp")
|
||||
BuildProject.__init__(self, uri, foldername, tmpdir="/tmp",
|
||||
dl_dir=dl_dir)
|
||||
|
||||
def download_archive(self):
|
||||
|
||||
self._download_archive()
|
||||
|
||||
(status, output) = self.target.copy_to(self.localarchive, self.targetdir)
|
||||
|
||||
@@ -7,17 +7,17 @@ import subprocess
|
||||
from oeqa.utils.buildproject import BuildProject
|
||||
|
||||
class SDKBuildProject(BuildProject):
|
||||
|
||||
def __init__(self, testpath, sdkenv, d, uri, foldername=None):
|
||||
def __init__(self, testpath, sdkenv, uri, testlogdir, builddatetime,
|
||||
foldername=None, dl_dir=None):
|
||||
self.sdkenv = sdkenv
|
||||
self.testdir = testpath
|
||||
self.targetdir = testpath
|
||||
bb.utils.mkdirhier(testpath)
|
||||
self.datetime = d.getVar('DATETIME')
|
||||
self.testlogdir = d.getVar("TEST_LOG_DIR")
|
||||
bb.utils.mkdirhier(self.testlogdir)
|
||||
os.makedirs(testpath, exist_ok=True)
|
||||
self.datetime = builddatetime
|
||||
self.testlogdir = testlogdir
|
||||
os.makedirs(self.testlogdir, exist_ok=True)
|
||||
self.logfile = os.path.join(self.testlogdir, "sdk_target_log.%s" % self.datetime)
|
||||
BuildProject.__init__(self, d, uri, foldername, tmpdir=testpath)
|
||||
BuildProject.__init__(self, uri, foldername, tmpdir=testpath, dl_dir=dl_dir)
|
||||
|
||||
def download_archive(self):
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user