mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
install-buildtools: fix "test installation" step
The "Test installation" step fails with some harmless error messages (see [1]). This can however make a user think that the buildtools have not been installed correctly. Two reasons for the error messages: - some envvars in the environment-setup-<arch>-pokysdk-linux file start and end with double quotes (e.g., PATH) and are as such written into python os.environ. This leads that their usage is not valid later when testing the installation. This patch removes the double quotes before writing, if they are present. - if installation directory (install_dir), given through the option --directory, is given as a relative path, checking if the path to a tool (e.g., gcc) in buildtools starts it will always fail. This patch converts the install_dir variable to an absolute path. [1] ERROR: Something went wrong: tar not found in ./build-tools ERROR: Something went wrong: installation failed (From OE-Core rev: e4eb0b14ecf9bd2fba13260441c9d86eb348f41e) Signed-off-by: Aleksandar Nikolic <aleksandar.nikolic@zeiss.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
cedb7197cc
commit
062c289efa
|
@ -102,6 +102,16 @@ def sha256_file(filename):
|
|||
import hashlib
|
||||
return _hasher(hashlib.sha256(), filename)
|
||||
|
||||
def remove_quotes(var):
|
||||
"""
|
||||
If a variable starts and ends with double quotes, remove them.
|
||||
Assumption: if a variable starts with double quotes, it must also
|
||||
end with them.
|
||||
"""
|
||||
if var[0] == '"':
|
||||
var = var[1:-1]
|
||||
return var
|
||||
|
||||
|
||||
def main():
|
||||
global DEFAULT_INSTALL_DIR
|
||||
|
@ -273,7 +283,7 @@ def main():
|
|||
os.chmod(tmpbuildtools, st.st_mode | stat.S_IEXEC)
|
||||
logger.debug(os.stat(tmpbuildtools))
|
||||
if args.directory:
|
||||
install_dir = args.directory
|
||||
install_dir = os.path.abspath(args.directory)
|
||||
ret = subprocess.call("%s -d %s -y" %
|
||||
(tmpbuildtools, install_dir), shell=True)
|
||||
else:
|
||||
|
@ -294,7 +304,7 @@ def main():
|
|||
if match:
|
||||
env_var = match.group('env_var')
|
||||
logger.debug("env_var: %s" % env_var)
|
||||
env_val = match.group('env_val')
|
||||
env_val = remove_quotes(match.group('env_val'))
|
||||
logger.debug("env_val: %s" % env_val)
|
||||
os.environ[env_var] = env_val
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user