summaryrefslogtreecommitdiff
path: root/poky/scripts/wic
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-03-26 23:08:25 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-03-26 23:09:42 +0300
commit40320b10a8431fc579173393e3a648e0c77b210a (patch)
tree0384086eb80321a26589b9f2851def0815d2a019 /poky/scripts/wic
parent8f73848b2e38df5b454913cf60ec7ed427f92413 (diff)
downloadopenbmc-40320b10a8431fc579173393e3a648e0c77b210a.tar.xz
poky: refresh thud: e4c0a8a7cb..9dfebdaf7a
Update poky to thud HEAD. Mazliana (2): scripts/resulttool: enable manual execution and result creation resulttool/manualexecution: To output right test case id Michael Halstead (1): yocto-uninative: Correct sha256sum for aarch64 Richard Purdie (12): resulttool: Improvements to allow integration to the autobuilder resulttool/resultutils: Avoids tracebacks for missing logs resulttool/store: Handle results files for multiple revisions resulttool/report: Handle missing metadata sections more cleanly resulttool/report: Ensure test suites with no results show up on the report resulttool/report: Ensure ptest results are sorted resulttool/store: Fix missing variable causing testresult corruption oeqa/utils/gitarchive: Handle case where parent is only on origin scripts/wic: Be consistent about how we call bitbake yocto-uninative: Update to 2.4 poky.conf: Bump version for 2.6.2 thud release build-appliance-image: Update to thud head revision Yeoh Ee Peng (4): resulttool: enable merge, store, report and regression analysis resulttool/regression: Ensure regressoin results are sorted scripts/resulttool: Enable manual result store and regression resulttool/report: Enable roll-up report for a commit Change-Id: Icf3c93db794539bdd4501d2e7db15c68b6c541ae Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/scripts/wic')
-rwxr-xr-xpoky/scripts/wic16
1 files changed, 5 insertions, 11 deletions
diff --git a/poky/scripts/wic b/poky/scripts/wic
index 37dfe2dc5..b4b7212cf 100755
--- a/poky/scripts/wic
+++ b/poky/scripts/wic
@@ -35,6 +35,7 @@ import os
import sys
import argparse
import logging
+import subprocess
from collections import namedtuple
from distutils import spawn
@@ -63,10 +64,7 @@ if os.environ.get('SDKTARGETSYSROOT'):
bitbake_exe = spawn.find_executable('bitbake')
if bitbake_exe:
bitbake_path = scriptpath.add_bitbake_lib_path()
- from bb import cookerdata
- from bb.main import bitbake_main, BitBakeConfigParameters
-else:
- bitbake_main = None
+ import bb
from wic import WicError
from wic.misc import get_bitbake_var, BB_VARS
@@ -124,7 +122,7 @@ def wic_create_subcommand(options, usage_str):
Command-line handling for image creation. The real work is done
by image.engine.wic_create()
"""
- if options.build_rootfs and not bitbake_main:
+ if options.build_rootfs and not bitbake_exe:
raise WicError("Can't build rootfs as bitbake is not in the $PATH")
if not options.image_name:
@@ -160,9 +158,7 @@ def wic_create_subcommand(options, usage_str):
argv.append("--debug")
logger.info("Building rootfs...\n")
- if bitbake_main(BitBakeConfigParameters(argv),
- cookerdata.CookerConfiguration()):
- raise WicError("bitbake exited with error")
+ subprocess.check_call(argv)
rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name)
@@ -179,9 +175,7 @@ def wic_create_subcommand(options, usage_str):
if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)):
logger.info("Building wic-tools...\n")
- if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()),
- cookerdata.CookerConfiguration()):
- raise WicError("bitbake wic-tools failed")
+ subprocess.check_call(["bitbake", "wic-tools"])
native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
if not native_sysroot: