[Xen-devel] [GPLPV] exclude xenscsi from installer, since it is not compiled

[Kristian Hagsted Rasmussen <kristian@xxxxxxxxxx>]

Hi James

 

I fiddled around with compiling you GPL PV driver, however I got an error when generating the MSI packages. The error was related to xenscsi which is not compiled, however WIX try to included. By applying the following patch, I successfully compiled the driver. It might not be the right approached just to remove the lines in installer.wxs, since I got an error relating to xenvbd when installing the driver on a windows 8.1 domU.

 

Best regards Kristian Hagsted Rasmussen

 

diff -r 5fa56ef930bf installer.wxs

--- a/installer.wxs            Tue Dec 24 15:44:06 2013 +1100

+++ b/installer.wxs         Fri Jan 03 12:34:25 2014 +0100

@@ -99,16 +99,6 @@

               </Component>

             </Directory>

             <?endif ?>

-            <?if $(env.DDK_TARGET_OS) != Win2K ?>

-            <Directory Id='XenScsiDir' Name='xenscsi'>

-              <Component Id='XenScsi' Guid='47C9AB48-3A7D-42b2-AE2C-7F9235C8B7B4'>

-                <File Id='xenscsi.cat' Name='xenscsi.cat' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.cat' />

-                <File Id='xenscsi.inf' Name='xenscsi.inf' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.inf' />

-                <File Id='xenscsi.sys' Name='xenscsi.sys' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.sys' />

-                <difx:Driver Sequence='2' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes' />

-              </Component>

-            </Directory>

-            <?endif ?>

             <Directory Id='XenNetDir' Name='xennet'>

               <Component Id='XenNet' Guid='F16B1EC7-35B1-42c2-9017-22DC23D80BE7'>

                 <File Id='xennet.cat' Name='xennet.cat' DiskId='1' Source='xennet\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xennet.cat' />

@@ -160,11 +150,6 @@

       <Feature Id='XenVbd' Title='XenVbd Driver' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>

         <ComponentRef Id='XenVbd' />

       </Feature>

-      <?if $(env.DDK_TARGET_OS) != Win2K ?>

-      <Feature Id='XenScsi' Title='XenScsi Driver' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>

-        <ComponentRef Id='XenScsi' />

-      </Feature>

-      <?endif ?>

       <Feature Id='XenNet' Title='XenNet Driver' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>

         <ComponentRef Id='XenNet' />

       </Feature>

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel