mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
bb0c26960d
Because exec_cmd() return values can in certain cases be non-zero yet non-fatal, we don't want to automatically make them fatal (though there should at least be a warning in such cases, which this patch also does); non-zero return values are definitely fatal however if they mean that a native command wasn't found, so have exec_native_cmd() check the return value of exec_cmd() for that case, and bail out if so. [YOCTO #5835] (From OE-Core rev: 43ac6e3216c5d985d6f90a28e727e397df616267) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
145 lines
4.2 KiB
Python
145 lines
4.2 KiB
Python
# ex:ts=4:sw=4:sts=4:et
|
|
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
|
#
|
|
# Copyright (c) 2013, Intel Corporation.
|
|
# All rights reserved.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License version 2 as
|
|
# published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
#
|
|
# DESCRIPTION
|
|
# This module provides a place to collect various mic-related utils
|
|
# for the OpenEmbedded Image Tools.
|
|
#
|
|
# AUTHORS
|
|
# Tom Zanussi <tom.zanussi (at] linux.intel.com>
|
|
#
|
|
|
|
from mic import msger
|
|
from mic.utils import runner
|
|
|
|
def exec_cmd(cmd_and_args, as_shell = False, catch = 3):
|
|
"""
|
|
Execute command, catching stderr, stdout
|
|
|
|
Need to execute as_shell if the command uses wildcards
|
|
"""
|
|
msger.debug("exec_cmd: %s" % cmd_and_args)
|
|
args = cmd_and_args.split()
|
|
msger.debug(args)
|
|
|
|
if (as_shell):
|
|
rc, out = runner.runtool(cmd_and_args, catch)
|
|
else:
|
|
rc, out = runner.runtool(args, catch)
|
|
out = out.strip()
|
|
msger.debug("exec_cmd: output for %s (rc = %d): %s" % \
|
|
(cmd_and_args, rc, out))
|
|
|
|
if rc != 0:
|
|
# We don't throw exception when return code is not 0, because
|
|
# parted always fails to reload part table with loop devices. This
|
|
# prevents us from distinguishing real errors based on return
|
|
# code.
|
|
msger.warning("WARNING: %s returned '%s' instead of 0" % (cmd_and_args, rc))
|
|
|
|
return (rc, out)
|
|
|
|
|
|
def exec_cmd_quiet(cmd_and_args, as_shell = False):
|
|
"""
|
|
Execute command, catching nothing in the output
|
|
|
|
Need to execute as_shell if the command uses wildcards
|
|
"""
|
|
return exec_cmd(cmd_and_args, as_shell, 0)
|
|
|
|
|
|
def exec_native_cmd(cmd_and_args, native_sysroot, catch = 3):
|
|
"""
|
|
Execute native command, catching stderr, stdout
|
|
|
|
Need to execute as_shell if the command uses wildcards
|
|
|
|
Always need to execute native commands as_shell
|
|
"""
|
|
native_paths = \
|
|
"export PATH=%s/sbin:%s/usr/sbin:%s/usr/bin:$PATH" % \
|
|
(native_sysroot, native_sysroot, native_sysroot)
|
|
native_cmd_and_args = "%s;%s" % (native_paths, cmd_and_args)
|
|
msger.debug("exec_native_cmd: %s" % cmd_and_args)
|
|
|
|
args = cmd_and_args.split()
|
|
msger.debug(args)
|
|
|
|
rc, out = exec_cmd(native_cmd_and_args, True, catch)
|
|
|
|
if rc == 127: # shell command-not-found
|
|
msger.error("A native (host) program required to build the image "
|
|
"was not found (see details above). Please make sure "
|
|
"it's installed and try again.")
|
|
|
|
return (rc, out)
|
|
|
|
|
|
def exec_native_cmd_quiet(cmd_and_args, native_sysroot):
|
|
"""
|
|
Execute native command, catching nothing in the output
|
|
|
|
Need to execute as_shell if the command uses wildcards
|
|
|
|
Always need to execute native commands as_shell
|
|
"""
|
|
return exec_native_cmd(cmd_and_args, native_sysroot, 0)
|
|
|
|
|
|
# kickstart doesn't support variable substution in commands, so this
|
|
# is our current simplistic scheme for supporting that
|
|
|
|
wks_vars = dict()
|
|
|
|
def get_wks_var(key):
|
|
return wks_vars[key]
|
|
|
|
def add_wks_var(key, val):
|
|
wks_vars[key] = val
|
|
|
|
BOOTDD_EXTRA_SPACE = 16384
|
|
IMAGE_EXTRA_SPACE = 10240
|
|
|
|
__bitbake_env_lines = ""
|
|
|
|
def set_bitbake_env_lines(bitbake_env_lines):
|
|
global __bitbake_env_lines
|
|
__bitbake_env_lines = bitbake_env_lines
|
|
|
|
def get_bitbake_env_lines():
|
|
return __bitbake_env_lines
|
|
|
|
def get_line_val(line, key):
|
|
"""
|
|
Extract the value from the VAR="val" string
|
|
"""
|
|
if line.startswith(key + "="):
|
|
stripped_line = line.split('=')[1]
|
|
stripped_line = stripped_line.replace('\"', '')
|
|
return stripped_line
|
|
return None
|
|
|
|
def get_bitbake_var(key):
|
|
for line in __bitbake_env_lines.split('\n'):
|
|
if (get_line_val(line, key)):
|
|
val = get_line_val(line, key)
|
|
return val
|
|
return None
|