4 files changed, 52 insertions, 0 deletions

diff --git a/scripts/lib/image/canned-wks/directdisk.wks b/scripts/lib/image/canned-wks/directdisk.wks
new file mode 100644
index 0000000000..d54b382fd0
--- /dev/null
+++ b/scripts/lib/image/canned-wks/directdisk.wks
@@ -0,0 +1,10 @@
+# short-description: Create a 'pcbios' direct disk image
+# long-description: Creates a partitioned legacy BIOS disk image that the user
+# can directly dd to boot media.
+
+
+part /boot --source bootimg --ondisk sda --fstype=msdos --label boot --active --align 1024
+part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024
+
+bootloader  --timeout=0  --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0"
+
diff --git a/scripts/lib/image/canned-wks/mkefidisk.wks b/scripts/lib/image/canned-wks/mkefidisk.wks
new file mode 100644
index 0000000000..8a3e1f6bc1
--- /dev/null
+++ b/scripts/lib/image/canned-wks/mkefidisk.wks
@@ -0,0 +1,11 @@
+# short-description: Create an EFI disk image
+# long-description: Creates a partitioned EFI disk image that the user
+# can directly dd to boot media.
+
+part /boot --source bootimg --ondisk sda --fstype=efi --label msdos --active --align 1024
+
+part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024
+
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap
+
+bootloader  --timeout=10  --append="rootwait rootfstype=ext3 console=ttyPCH0,115200 console=tty0 vmalloc=256MB snd-hda-intel.enable_msi=0"
diff --git a/scripts/lib/image/config/wic.conf b/scripts/lib/image/config/wic.conf
new file mode 100644
index 0000000000..e96d6aec45
--- /dev/null
+++ b/scripts/lib/image/config/wic.conf
@@ -0,0 +1,7 @@
+[common]
+; general settings
+distro_name = OpenEmbedded
+
+[create]
+; settings for create subcommand
+runtime=native
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index a9b530cc04..be29222df1 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -37,6 +37,12 @@ import subprocess
 import shutil
 
 import os, sys, errno
+from mic import msger, creator
+from mic.utils import cmdln, misc, errors
+from mic.conf import configmgr
+from mic.plugin import pluginmgr
+from mic.__version__ import VERSION
+from mic.utils.oe.misc import *
 
 
 def verify_build_env():
@@ -216,6 +222,24 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
         print "BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?)"
         sys.exit(1)
 
+    direct_args = list()
+    direct_args.insert(0, oe_builddir)
+    direct_args.insert(0, image_output_dir)
+    direct_args.insert(0, wks_file)
+    direct_args.insert(0, rootfs_dir)
+    direct_args.insert(0, bootimg_dir)
+    direct_args.insert(0, kernel_dir)
+    direct_args.insert(0, native_sysroot)
+    direct_args.insert(0, hdddir)
+    direct_args.insert(0, staging_data_dir)
+    direct_args.insert(0, "direct")
+
+    cr = creator.Creator()
+
+    cr.main(direct_args)
+
+    print "\nThe image(s) were created using OE kickstart file:\n  %s" % wks_file
+
 
 def wic_list(args, scripts_path, properties_file):
     """