[oe-commits] Tom Zanussi : wic: Fix kernel dir location
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 21 22:06:05 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 453d0a9823665870e273a37657d6e27fb788d72e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=453d0a9823665870e273a37657d6e27fb788d72e
Author: Tom Zanussi <tom.zanussi at linux.intel.com>
Date: Fri Feb 20 14:14:01 2015 -0600
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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/lib/image/engine.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index e794545..68d1ce2 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
More information about the Openembedded-commits
mailing list