diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-26 21:27:31 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-02 23:08:36 +0100 |
commit | aa470a1fcd09abbc570d3d885aff460603ef9925 (patch) | |
tree | f04cc1fe57fa3a1310ce8c7cab3cd213d5b7c6a1 /scripts/lib/image | |
parent | 673343414f4c9db32e3e0c58f07c59954bab734c (diff) | |
download | poky-aa470a1fcd09abbc570d3d885aff460603ef9925.tar.gz |
wic: Refactor getting bitbake variables
Wic gets bitbake variables by parsing output of 'bitbake -e' command.
This implementation improves this procedure as it runs 'bitbake -e' only
when API is called and does it only once, i.e. in a "lazy" way. As parsing
results are cached 'bitbake -e' is run only once and results are parsed
only once per requested set of variables.
get_bitbake_var became the only API call. It replaces find_artifacts,
find_artifact, find_bitbake_env_lines, get_bitbake_env_lines,
set_bitbake_env_lines and get_line_val calls making API much more clear.
(From OE-Core rev: 3abe23bd217315246ec2d98dc9c390b85cfe6a92)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/image')
-rw-r--r-- | scripts/lib/image/engine.py | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 47950f8d15..92dcc5a4f9 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py | |||
@@ -60,29 +60,6 @@ def verify_build_env(): | |||
60 | return True | 60 | return True |
61 | 61 | ||
62 | 62 | ||
63 | def find_artifacts(image_name): | ||
64 | """ | ||
65 | Gather the build artifacts for the current image (the image_name | ||
66 | e.g. core-image-minimal) for the current MACHINE set in local.conf | ||
67 | """ | ||
68 | bitbake_env_lines = misc.get_bitbake_env_lines() | ||
69 | |||
70 | rootfs_dir = kernel_dir = bootimg_dir = native_sysroot = "" | ||
71 | |||
72 | for line in bitbake_env_lines.split('\n'): | ||
73 | if misc.get_line_val(line, "IMAGE_ROOTFS"): | ||
74 | rootfs_dir = misc.get_line_val(line, "IMAGE_ROOTFS") | ||
75 | continue | ||
76 | if misc.get_line_val(line, "DEPLOY_DIR_IMAGE"): | ||
77 | kernel_dir = misc.get_line_val(line, "DEPLOY_DIR_IMAGE") | ||
78 | continue | ||
79 | if misc.get_line_val(line, "STAGING_DIR_NATIVE"): | ||
80 | native_sysroot = misc.get_line_val(line, "STAGING_DIR_NATIVE") | ||
81 | continue | ||
82 | |||
83 | return (rootfs_dir, kernel_dir, bootimg_dir, native_sysroot) | ||
84 | |||
85 | |||
86 | CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts | 63 | CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts |
87 | SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR | 64 | SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR |
88 | 65 | ||