From b4a936a938cb914fc62add7a3e535915946aee81 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 20 Feb 2015 14:14:01 -0600 Subject: 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]. (From OE-Core rev: 453d0a9823665870e273a37657d6e27fb788d72e) Signed-off-by: Tom Zanussi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/image/engine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3-54-g00ecf