[for-daisy][PATCH 0/2] wic: A couple minor fixes

[for-daisy][PATCH 0/2] wic: A couple minor fixes

[Tom Zanussi]

Just a couple minor fixes things noticed while testing.

The following changes since commit d8155f1f95a041fa6b7f4c7881f52a0989446ba5:

  documentation: Updated manual history tables to support 1.6.2 (2014-07-22 15:05:12 +0100)

are available in the git repository at:

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

Tom Zanussi (2):
  wic: Fix bad directory name in bootimg-efi
  wic: Remove fstype from mkefidisk canned wks

 scripts/lib/image/canned-wks/mkefidisk.wks    | 2 +-
 scripts/lib/mic/plugins/source/bootimg-efi.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.8.3.1

[for-daisy][PATCH 1/2] wic: Fix bad directory name in bootimg-efi

[Tom Zanussi]

The original move of the mkefidisk code to the bootimg-efi plugin
resulted in a bad hdddir - fix it.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 scripts/lib/mic/plugins/source/bootimg-efi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py
index 2cc179a..0dd9152 100644
--- a/scripts/lib/mic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/mic/plugins/source/bootimg-efi.py
@@ -112,7 +112,7 @@ class BootimgEFIPlugin(SourcePlugin):
         staging_kernel_dir = kernel_dir
         staging_data_dir = bootimg_dir
 
-        hdddir = "%s/hdd" % cr_workdir
+        hdddir = "%s/hdd/boot" % cr_workdir
 
         install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \
             (staging_kernel_dir, hdddir)
-- 
1.8.3.1

[for-daisy][PATCH 2/2] wic: Remove fstype from mkefidisk canned wks

[Tom Zanussi]

The bootimg-efi plugin specifies the fstype internally, so remove it
from the partition definition.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 scripts/lib/image/canned-wks/mkefidisk.wks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/image/canned-wks/mkefidisk.wks b/scripts/lib/image/canned-wks/mkefidisk.wks
index e976bc8..db86caa 100644
--- a/scripts/lib/image/canned-wks/mkefidisk.wks
+++ b/scripts/lib/image/canned-wks/mkefidisk.wks
@@ -2,7 +2,7 @@
 # long-description: Creates a partitioned EFI disk image that the user
 # can directly dd to boot media.
 
-part /boot --source bootimg-efi --ondisk sda --fstype=msdos --label msdos --active --align 1024
+part /boot --source bootimg-efi --ondisk sda --label msdos --active --align 1024
 
 part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024
 
-- 
1.8.3.1