diff options
Diffstat (limited to 'scripts/lib/image')
-rw-r--r-- | scripts/lib/image/engine.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 3813fec609..f1df8b4db8 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py | |||
@@ -67,8 +67,7 @@ def find_artifacts(image_name): | |||
67 | """ | 67 | """ |
68 | bitbake_env_lines = get_bitbake_env_lines() | 68 | bitbake_env_lines = get_bitbake_env_lines() |
69 | 69 | ||
70 | rootfs_dir = kernel_dir = bootimg_dir = "" | 70 | rootfs_dir = kernel_dir = hdddir = staging_data_dir = native_sysroot = "" |
71 | hdddir = staging_data_dir = native_sysroot = "" | ||
72 | 71 | ||
73 | for line in bitbake_env_lines.split('\n'): | 72 | for line in bitbake_env_lines.split('\n'): |
74 | if (get_line_val(line, "IMAGE_ROOTFS")): | 73 | if (get_line_val(line, "IMAGE_ROOTFS")): |
@@ -86,12 +85,8 @@ def find_artifacts(image_name): | |||
86 | if (get_line_val(line, "STAGING_DIR_NATIVE")): | 85 | if (get_line_val(line, "STAGING_DIR_NATIVE")): |
87 | native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE") | 86 | native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE") |
88 | continue | 87 | continue |
89 | if (get_line_val(line, "DEPLOY_DIR_IMAGE")): | ||
90 | bootimg_dir = get_line_val(line, "DEPLOY_DIR_IMAGE") | ||
91 | continue | ||
92 | 88 | ||
93 | return (rootfs_dir, kernel_dir, bootimg_dir, hdddir, staging_data_dir, \ | 89 | return (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) |
94 | native_sysroot) | ||
95 | 90 | ||
96 | 91 | ||
97 | CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts | 92 | CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts |