summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/image/engine.py9
-rwxr-xr-xscripts/wic7
2 files changed, 11 insertions, 5 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index f1df8b4db8..3813fec609 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -67,7 +67,8 @@ 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 = hdddir = staging_data_dir = native_sysroot = "" 70 rootfs_dir = kernel_dir = bootimg_dir = ""
71 hdddir = staging_data_dir = native_sysroot = ""
71 72
72 for line in bitbake_env_lines.split('\n'): 73 for line in bitbake_env_lines.split('\n'):
73 if (get_line_val(line, "IMAGE_ROOTFS")): 74 if (get_line_val(line, "IMAGE_ROOTFS")):
@@ -85,8 +86,12 @@ def find_artifacts(image_name):
85 if (get_line_val(line, "STAGING_DIR_NATIVE")): 86 if (get_line_val(line, "STAGING_DIR_NATIVE")):
86 native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE") 87 native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE")
87 continue 88 continue
89 if (get_line_val(line, "DEPLOY_DIR_IMAGE")):
90 bootimg_dir = get_line_val(line, "DEPLOY_DIR_IMAGE")
91 continue
88 92
89 return (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) 93 return (rootfs_dir, kernel_dir, bootimg_dir, hdddir, staging_data_dir, \
94 native_sysroot)
90 95
91 96
92CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts 97CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts
diff --git a/scripts/wic b/scripts/wic
index 15cc9b31ef..731481007c 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -134,8 +134,8 @@ def wic_create_subcommand(args, usage_str):
134 bootimg_dir = staging_data_dir = hdddir = "" 134 bootimg_dir = staging_data_dir = hdddir = ""
135 135
136 if options.image_name: 136 if options.image_name:
137 (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) = \ 137 (rootfs_dir, kernel_dir, bootimg_dir, hdddir, \
138 find_artifacts(options.image_name) 138 staging_data_dir, native_sysroot) = find_artifacts(options.image_name)
139 139
140 wks_file = args[0] 140 wks_file = args[0]
141 141
@@ -172,7 +172,8 @@ def wic_create_subcommand(args, usage_str):
172 not_found = not_found_dir = "" 172 not_found = not_found_dir = ""
173 if not os.path.isdir(rootfs_dir): 173 if not os.path.isdir(rootfs_dir):
174 (not_found, not_found_dir) = ("rootfs-dir", rootfs_dir) 174 (not_found, not_found_dir) = ("rootfs-dir", rootfs_dir)
175 elif not os.path.isdir(hdddir) and not os.path.isdir(staging_data_dir): 175 elif not os.path.isdir(bootimg_dir) and not os.path.isdir(hdddir) \
176 and not os.path.isdir(staging_data_dir):
176 (not_found, not_found_dir) = ("bootimg-dir", bootimg_dir) 177 (not_found, not_found_dir) = ("bootimg-dir", bootimg_dir)
177 elif not os.path.isdir(kernel_dir): 178 elif not os.path.isdir(kernel_dir):
178 (not_found, not_found_dir) = ("kernel-dir", kernel_dir) 179 (not_found, not_found_dir) = ("kernel-dir", kernel_dir)