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:56 +0100 |
| commit | 7ce1dc13f91df70e8a2f420e7c3eba51cbc4bd48 (patch) | |
| tree | b9eeab64eeb01e3fd7985b19876a4009db713d0b /scripts/lib | |
| parent | 48ff3fa3a50add60ff69a0067d189adcfa356bd6 (diff) | |
| download | ast2050-yocto-poky-7ce1dc13f91df70e8a2f420e7c3eba51cbc4bd48.zip ast2050-yocto-poky-7ce1dc13f91df70e8a2f420e7c3eba51cbc4bd48.tar.gz | |
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.
(From OE-Core rev: d7f69e6f0932a927b6ce289fb47ba575d7aaa1c8)
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/lib')
| -rw-r--r-- | scripts/lib/image/engine.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index f1df8b4..3813fec 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 |
