From f0bb47b0d7ab6520c105ce131844269172de3efd Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 3 Feb 2014 19:16:55 -0600 Subject: wic: Create and use new functions for getting bitbake variables Add get_bitbake_var() and bitbake_env_lines() functions for use by plugins, which will need access to them for customization. Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/image/engine.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'scripts/lib/image/engine.py') diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 0e8b89e5f1..2dd98b968c 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -60,16 +60,26 @@ def verify_build_env(): return True -def find_artifacts(image_name): +def find_bitbake_env_lines(image_name): """ - Gather the build artifacts for the current image (the image_name - e.g. core-image-minimal) for the current MACHINE set in local.conf + If image_name is empty, plugins might still be able to use the + environment, so set it regardless. """ bitbake_env_cmd = "bitbake -e %s" % image_name rc, bitbake_env_lines = exec_cmd(bitbake_env_cmd) if rc != 0: - print "Couldn't get '%s' output, exiting." % bitbake_env_cmd - sys.exit(1) + print "Couldn't get '%s' output." % bitbake_env_cmd + return None + + return bitbake_env_lines + + +def find_artifacts(image_name): + """ + Gather the build artifacts for the current image (the image_name + e.g. core-image-minimal) for the current MACHINE set in local.conf + """ + bitbake_env_lines = get_bitbake_env_lines() rootfs_dir = kernel_dir = hdddir = staging_data_dir = native_sysroot = "" -- cgit 1.2.3-korg