sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Revert "wic: set bootimg_dir when using image-name artifacts" 

This reverts commit 7ce1dc13f9.

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>
This commit is contained in:
Tom Zanussi 2014-10-29 17:04:22 -05:00 committed by Richard Purdie
parent d1f8b8f5d0
commit 38400617fe
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/lib/image/engine.py
View File

@ -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

7
scripts/wic
View File

@ -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)