diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2015-02-20 14:14:01 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-21 22:04:25 +0000 |
| commit | 453d0a9823665870e273a37657d6e27fb788d72e (patch) | |
| tree | 05fd85d344d47f4500c380d890edcc1ba8ab9cd9 /scripts/lib | |
| parent | 5cd320d8d21cd784b32f12a6944dc647a75abf94 (diff) | |
| download | openembedded-core-453d0a9823665870e273a37657d6e27fb788d72e.tar.gz openembedded-core-453d0a9823665870e273a37657d6e27fb788d72e.tar.bz2 openembedded-core-453d0a9823665870e273a37657d6e27fb788d72e.zip | |
wic: Fix kernel dir location
With the recent kernel staging changes, STAGING_KERNEL_DIR no longer
points to the kernel image, which can be found however in
DEPLOY_DIR_IMAGE. This updates find_artifacts() to look there
instead.
Fixes [YOCTO #7307].
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/image/engine.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index e794545e94..68d1ce2659 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -73,8 +73,8 @@ def find_artifacts(image_name): if (get_line_val(line, "IMAGE_ROOTFS")): rootfs_dir = get_line_val(line, "IMAGE_ROOTFS") continue - if (get_line_val(line, "STAGING_KERNEL_DIR")): - kernel_dir = get_line_val(line, "STAGING_KERNEL_DIR") + if (get_line_val(line, "DEPLOY_DIR_IMAGE")): + kernel_dir = get_line_val(line, "DEPLOY_DIR_IMAGE") continue if (get_line_val(line, "STAGING_DIR_NATIVE")): native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE") @@ -200,7 +200,7 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, values from the output of 'bitbake -e': rootfs_dir: IMAGE_ROOTFS - kernel_dir: STAGING_KERNEL_DIR + kernel_dir: DEPLOY_DIR_IMAGE native_sysroot: STAGING_DIR_NATIVE In the above case, bootimg_dir remains unset and the |