From 6a39901b8e5276dc34402ebea273740c40fbd7c4 Mon Sep 17 00:00:00 2001
From: Ian McLeod <imcleod@redhat.com>
Date: Jun 08 2016 14:10:45 +0000
Subject: [PATCH 1/2] expose Factory hyperv support in builder


---

diff --git a/builder/kojid b/builder/kojid
index fbad74f..240b5ef 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -3411,7 +3411,7 @@ class BaseImageTask(OzImageTask):
         Some image formats require others to be processed first, which is why
         we have to do this. raw files in particular may not be kept.
         """
-        supported = ('raw', 'raw-xz', 'liveimg-squashfs', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova', 'docker', 'vagrant-virtualbox', 'vagrant-libvirt', 'vagrant-vmware-fusion', 'vpc', "tar-gz")
+        supported = ('raw', 'raw-xz', 'liveimg-squashfs', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova', 'docker', 'vagrant-virtualbox', 'vagrant-libvirt', 'vagrant-vmware-fusion', 'vagrant-hyperv', 'vpc', "tar-gz")
         for f in formats:
             if f not in supported:
                 raise koji.ApplianceError('Invalid format: %s' % f)
@@ -3449,6 +3449,7 @@ class BaseImageTask(OzImageTask):
                   'vagrant-virtualbox': self._buildOVA,
                   'vagrant-libvirt':    self._buildOVA,
                   'vagrant-vmware-fusion': self._buildOVA,
+                  'vagrant-hyperv': self._buildOVA,
                   'docker':      self._buildDocker
         }
         # add a handler to the logger so that we capture ImageFactory's logging
@@ -3693,6 +3694,10 @@ class BaseImageTask(OzImageTask):
             # not the stream oriented format used for VirtualBox or regular VMWare OVAs
             img_opts['vsphere_vmdk_format'] = 'standard'
             fixed_params = [ 'vsphere_ova_format', 'vsphere_vmdk_format' ]
+        if format == 'vagrant-hyperv':
+            format = 'hyperv-ova'
+            img_opts['hyperv_ova_format'] = 'hyperv-vagrant'
+            fixed_params = [ 'hyperv_ova_format' ]
         targ = self._do_target_image(self.base_img.base_image.identifier,
             format.replace('-ova', ''), img_opts=img_opts, fixed_params=fixed_params)
         targ2 = self._do_target_image(targ.target_image.identifier, 'OVA',

From 5b80c0777f67f7bae4d93201144006dd8a858eec Mon Sep 17 00:00:00 2001
From: Ian McLeod <imcleod@redhat.com>
Date: Jun 08 2016 14:11:52 +0000
Subject: [PATCH 2/2] show hyperv support in CLI help


---

diff --git a/cli/koji b/cli/koji
index cd952d4..0abe244 100755
--- a/cli/koji
+++ b/cli/koji
@@ -5477,7 +5477,7 @@ def handle_image_build(options, session, args):
     """[build] Create a disk image given an install tree"""
     formats = ('vmdk', 'qcow', 'qcow2', 'vdi', 'vpc', 'rhevm-ova',
                'vsphere-ova', 'vagrant-virtualbox', 'vagrant-libvirt',
-               'vagrant-vmware-fusion', 'docker', 'raw-xz',
+               'vagrant-vmware-fusion', 'vagrant-hyperv', 'docker', 'raw-xz',
                'liveimg-squashfs', 'tar-gz')
     usage = _("usage: %prog image-build [options] <name> <version> " +
               "<target> <install-tree-url> <arch> [<arch>...]")