diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-11-26 08:22:07 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-26 17:01:43 +0000 |
| commit | 36c93423ee272c4d4aafeb50f83734fd4bb3bb29 (patch) | |
| tree | 1842e31c85e55035390444d33537df5b145264ca /scripts/wic | |
| parent | e7f18c43f1b368b71acdc507e1a9035179d7e53f (diff) | |
| download | openembedded-core-36c93423ee272c4d4aafeb50f83734fd4bb3bb29.tar.gz openembedded-core-36c93423ee272c4d4aafeb50f83734fd4bb3bb29.tar.bz2 openembedded-core-36c93423ee272c4d4aafeb50f83734fd4bb3bb29.zip | |
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)
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-x | scripts/wic | 7 |
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): bootimg_dir = staging_data_dir = hdddir = "" if options.image_name: - (rootfs_dir, kernel_dir, bootimg_dir, hdddir, \ - staging_data_dir, native_sysroot) = find_artifacts(options.image_name) + (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) = \ + find_artifacts(options.image_name) wks_file = args[0] @@ -172,8 +172,7 @@ def wic_create_subcommand(args, usage_str): not_found = not_found_dir = "" if not os.path.isdir(rootfs_dir): (not_found, not_found_dir) = ("rootfs-dir", rootfs_dir) - elif not os.path.isdir(bootimg_dir) and not os.path.isdir(hdddir) \ - and not os.path.isdir(staging_data_dir): + elif not os.path.isdir(hdddir) and not os.path.isdir(staging_data_dir): (not_found, not_found_dir) = ("bootimg-dir", bootimg_dir) elif not os.path.isdir(kernel_dir): (not_found, not_found_dir) = ("kernel-dir", kernel_dir) |