summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-11-26 08:22:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-26 17:05:46 +0000
commit90a03e9c9d4318c2a333c5c897f6a4aca1286595 (patch)
tree85c69801c8bdd47750cea9fd10270c92f3f56d0e /scripts/wic
parentb466e00cf6aba73d265f0515c980e12ff5175a5e (diff)
downloadpoky-90a03e9c9d4318c2a333c5c897f6a4aca1286595.tar.gz
Revert "wic: set bootimg_dir when using image-name artifacts"
This reverts commit 7ce1dc13f91df70e8a2f420e7c3eba51cbc4bd48. This patch broke the assumption that a non-null boot_dir means a user-assigned (-b command-line param) value. Reverting doesn't break anything, since the case it was added for doesn't use the boot_dir for anything except debugging anyhow. Fixes [YOCTO #6290] (From OE-Core rev: db90f10bf31dec8d7d7bb2d3680d50e133662850) (From OE-Core rev: 36c93423ee272c4d4aafeb50f83734fd4bb3bb29) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/wic')
-rwxr-xr-xscripts/wic7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/wic b/scripts/wic
index 731481007c..15cc9b31ef 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, bootimg_dir, hdddir, \ 137 (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) = \
138 staging_data_dir, native_sysroot) = 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,7 @@ 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(bootimg_dir) and not os.path.isdir(hdddir) \ 175 elif not os.path.isdir(hdddir) and not os.path.isdir(staging_data_dir):
176 and not os.path.isdir(staging_data_dir):
177 (not_found, not_found_dir) = ("bootimg-dir", bootimg_dir) 176 (not_found, not_found_dir) = ("bootimg-dir", bootimg_dir)
178 elif not os.path.isdir(kernel_dir): 177 elif not os.path.isdir(kernel_dir):
179 (not_found, not_found_dir) = ("kernel-dir", kernel_dir) 178 (not_found, not_found_dir) = ("kernel-dir", kernel_dir)