Skip to contentSkip to conversation

wic bugfix

PATCH New Tom Zanussi 1 participant 2 messages Feb 20, 2015

lore
Share & tools
lore
#0 lore raw

cover wic bugfix

This fixes [Yocto Bug 7307 - wic create mkefidisk/mkgummidisk images fails].

Tested directdisk/mkefidisk/mkgummidisk image generation with core-image-minimal for nuc, which all now work again with this patch.

The following changes since commit 5db6a27f4847e51c6434a968f81d3ceffcc54952:

bitbake: toaster: importlayer Remove description input field (2015-02-20 12:58:20 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/wic-bug-7307
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/wic-bug-7307

Tom Zanussi (1):
wic: Fix kernel dir location

 scripts/lib/image/engine.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.9.3
#1 lore raw

PATCH 1/1 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].

---
 scripts/lib/image/engine.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/lib/image/engine.py +3 -3
index e794545..68d1ce2 100644
@@ -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
Signature · 1 line
1.9.3