diff options
| author | Maciej Borzecki <maciej.borzecki@open-rnd.pl> | 2014-09-22 13:35:16 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-23 20:35:42 +0100 |
| commit | d7f69e6f0932a927b6ce289fb47ba575d7aaa1c8 (patch) | |
| tree | cd2f5f241f5af106c2cec30516c16ab6938ef03a /scripts | |
| parent | 99bee4cb489800d74dea4d2158ff834413685f04 (diff) | |
| download | openembedded-core-d7f69e6f0932a927b6ce289fb47ba575d7aaa1c8.tar.gz openembedded-core-d7f69e6f0932a927b6ce289fb47ba575d7aaa1c8.tar.bz2 openembedded-core-d7f69e6f0932a927b6ce289fb47ba575d7aaa1c8.zip | |
wic: set bootimg_dir when using image-name artifacts
Running wic with -e to use artifacts from a named image, bootimg_dir was
always passed as empty string to partition source plugins. The patch
sets bootimg_dir to current value of DEPLOY_DIR_IMAGE, as bootloader
artifacts end up in that location as well.
Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
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, 11 insertions, 5 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index f1df8b4db8..3813fec609 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -67,7 +67,8 @@ def find_artifacts(image_name): """ bitbake_env_lines = get_bitbake_env_lines() - rootfs_dir = kernel_dir = hdddir = staging_data_dir = native_sysroot = "" + rootfs_dir = kernel_dir = bootimg_dir = "" + hdddir = staging_data_dir = native_sysroot = "" for line in bitbake_env_lines.split('\n'): if (get_line_val(line, "IMAGE_ROOTFS")): @@ -85,8 +86,12 @@ 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, hdddir, staging_data_dir, native_sysroot) + return (rootfs_dir, kernel_dir, bootimg_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 15cc9b31ef..731481007c 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, hdddir, staging_data_dir, native_sysroot) = \ - find_artifacts(options.image_name) + (rootfs_dir, kernel_dir, bootimg_dir, hdddir, \ + staging_data_dir, native_sysroot) = find_artifacts(options.image_name) wks_file = args[0] @@ -172,7 +172,8 @@ 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(hdddir) and not os.path.isdir(staging_data_dir): + elif not os.path.isdir(bootimg_dir) and 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) |