diff options
Diffstat (limited to 'scripts/wic')
-rwxr-xr-x | scripts/wic | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/wic b/scripts/wic index 15cc9b31ef..e7df60f28e 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -131,11 +131,11 @@ def wic_create_subcommand(args, usage_str): | |||
131 | sys.exit(1) | 131 | sys.exit(1) |
132 | set_bitbake_env_lines(bitbake_env_lines) | 132 | set_bitbake_env_lines(bitbake_env_lines) |
133 | 133 | ||
134 | bootimg_dir = staging_data_dir = hdddir = "" | 134 | bootimg_dir = "" |
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, native_sysroot) \ |
138 | find_artifacts(options.image_name) | 138 | = find_artifacts(options.image_name) |
139 | 139 | ||
140 | wks_file = args[0] | 140 | wks_file = args[0] |
141 | 141 | ||
@@ -172,8 +172,6 @@ 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): | ||
176 | (not_found, not_found_dir) = ("bootimg-dir", bootimg_dir) | ||
177 | elif not os.path.isdir(kernel_dir): | 175 | elif not os.path.isdir(kernel_dir): |
178 | (not_found, not_found_dir) = ("kernel-dir", kernel_dir) | 176 | (not_found, not_found_dir) = ("kernel-dir", kernel_dir) |
179 | elif not os.path.isdir(native_sysroot): | 177 | elif not os.path.isdir(native_sysroot): |
@@ -197,8 +195,8 @@ def wic_create_subcommand(args, usage_str): | |||
197 | rootfs_dir = rootfs_dir_to_args(krootfs_dir) | 195 | rootfs_dir = rootfs_dir_to_args(krootfs_dir) |
198 | 196 | ||
199 | wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, | 197 | wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, |
200 | native_sysroot, hdddir, staging_data_dir, scripts_path, | 198 | native_sysroot, scripts_path, image_output_dir, |
201 | image_output_dir, options.debug, options.properties_file) | 199 | options.debug, options.properties_file) |
202 | 200 | ||
203 | 201 | ||
204 | def wic_list_subcommand(args, usage_str): | 202 | def wic_list_subcommand(args, usage_str): |