diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-10-29 17:04:22 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-30 13:03:30 +0000 |
| commit | db90f10bf31dec8d7d7bb2d3680d50e133662850 (patch) | |
| tree | 7b85e924108476f39c085d0fc67664c440b6bf9a /scripts | |
| parent | cf5144ef241d8f4ccaa3461ae5c9f89c2cf2f8d1 (diff) | |
| download | openembedded-core-db90f10bf31dec8d7d7bb2d3680d50e133662850.tar.gz openembedded-core-db90f10bf31dec8d7d7bb2d3680d50e133662850.tar.bz2 openembedded-core-db90f10bf31dec8d7d7bb2d3680d50e133662850.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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/image/engine.py | 9 | ||||
| -rwxr-xr-x | scripts/wic | 7 |
2 files changed, 5 insertions, 11 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): """ bitbake_env_lines = get_bitbake_env_lines() - rootfs_dir = kernel_dir = bootimg_dir = "" - hdddir = staging_data_dir = native_sysroot = "" + rootfs_dir = kernel_dir = hdddir = staging_data_dir = native_sysroot = "" for line in bitbake_env_lines.split('\n'): if (get_line_val(line, "IMAGE_ROOTFS")): @@ -86,12 +85,8 @@ def find_artifacts(image_name): if (get_line_val(line, "STAGING_DIR_NATIVE")): native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE") continue - if (get_line_val(line, "DEPLOY_DIR_IMAGE")): - bootimg_dir = get_line_val(line, "DEPLOY_DIR_IMAGE") - continue - return (rootfs_dir, kernel_dir, bootimg_dir, hdddir, staging_data_dir, \ - native_sysroot) + return (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts 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) |