[ofw] netipoib.inf mods to remove ND components from ia64 installs.

[Reuven Amitai]

Hi Stan,

How come netipoib-xp32.inf has WOW64 CopyFiles directive and WSD
reference ?

Thanks, Reuven.

-----Original Message-----
From: ofw-bounces at lists.openfabrics.org
[mailto:ofw-bounces at lists.openfabrics.org] On Behalf Of Smith, Stan
Sent: Wednesday, April 22, 2009 1:02 AM
To: Tzachi Dar; Leonid Keller
Cc: ofw at lists.openfabrics.org
Subject: [ofw] netipoib.inf mods to remove ND components from ia64
installs.


Hello,
  With the inclusion of ND IB provider source and ndinstall src into SVN
tree we have a limitation w.r.t. no reasonable ND support for IA64; ND
provider does not build for IA64.

Microsoft officially supports ND on Server 2008 running on x64.
The good news is ND provider & installer both build for all x64 & x86
architectures.
Which brings us to the no support for ND provider and/or installer for
IA64 story.

We need to modify the netIPoIB.inx file such that when IPoIB is
installed on IA64 the ND components (ibndprov.dll,ndinstall.exe) are not
assumed to be present.

If you would kindly review the netIPoIB*.* patches for svn commit I
could move forward with including the actual build of ND IB provider and
ndinstall into a WinOF release.

BTW, the makefiles for ul\nd\user\makefile and
tools\ndinstall\user\makefile will be modified to build only if the HPC
SDK is installed on your build system as ND header files are required
which are 'only' part of the HPC SDK; definition of the env var 'ND_INC'
is valid; sorry I digress.

Thank you,

Stan.


Signed off by stan.smith at intel.com

Patches IPoIB.inx

diff U3 C:/Documents and Settings/scsmith/Local
Settings/Temp/netipoib.inx-revBASE.svn000.tmp.inx C:/Documents and
Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/trunk/ulp/ipoib/kernel/netipoib.inx
--- C:/Documents and Settings/scsmith/Local
Settings/Temp/netipoib.inx-revBASE.svn000.tmp.inx   Tue Apr 21 14:24:21
2009
+++ C:/Documents and Settings/scsmith/My 
+++ Documents/openIB-windows/SVN/gen1/trunk/ulp/ipoib/kernel/netipoib.in
+++ x  Thu Apr 16 12:13:31 2009
@@ -51,8 +51,7 @@
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
 CopyFiles       = WsdCopyFiles
-CopyFiles       = NdCopyFiles
-CopyFiles       = WOW64CopyFiles
+CopyFiles       = WOW64WsdCopyFiles

 [Ipoib.DDInstall.ntx86.Services]
 AddService = ipoib, 2, IpoibService, IpoibEventLog @@ -201,6 +200,9 @@
 ibwsd.dll,ibwsd32.dll,,0x00000002
 ibndprov.dll,ibndprov32.dll,,0x00000002

+[WOW64WsdCopyFiles]
+ibwsd.dll,ibwsd32.dll,,0x00000002
+
 [SourceDisksNames.x86]
 1 = %IcsDisk1%,,,""

@@ -228,15 +230,13 @@
 ipoib.sys = 1
 ibwsd.dll = 1
 ibwsd32.dll = 1
-ibndprov.dll = 1
-ibndprov32.dll = 1
-ndinstall.exe = 1

 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
 WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%
+WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%

 [Strings]

Patches for XP/32. I've attempted to match netipoib_xp32.inf to
netipoib.inx for as much as makes sense to make it easier to track
changes to netipoib.inx; the down side of this is there is extra
directives in netipoib_xp32.inf which are never used (x64/ia64).

diff U3 C:/Documents and Settings/scsmith/Local
Settings/Temp/netipoib-xp32.in-revBASE.svn001.tmp.inf C:/Documents and
Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/trunk/ulp/ipoib/kernel/netipoib-xp32.i
nf
--- C:/Documents and Settings/scsmith/Local
Settings/Temp/netipoib-xp32.in-revBASE.svn001.tmp.inf       Tue Apr 21
14:30:54 2009
+++ C:/Documents and Settings/scsmith/My
Documents/openIB-windows/SVN/gen1/trunk/ulp/ipoib/kernel/netipoib-xp32.i
nf     Thu Apr 16 12:14:07 2009
@@ -7,7 +7,7 @@
 Class       = Net
 ClassGUID   = {4d36e972-e325-11ce-bfc1-08002be10318}
 Provider    = %OPENIB%
-DriverVer=10/10/2008,2.0.0000.1630
+DriverVer=10/10/2008,2.0.0000.2102
 CatalogFile=ipoib.cat

 [Manufacturer]
@@ -41,6 +41,7 @@
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
+CopyFiles       = WsdCopyFiles
 CopyFiles       = NdCopyFiles
 CopyFiles       = WOW64CopyFiles

@@ -48,8 +49,8 @@
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
-CopyFiles       = NdCopyFiles
-CopyFiles       = WOW64CopyFiles
+CopyFiles       = WsdCopyFiles
+CopyFiles       = WOW64WsdCopyFiles

 [Ipoib.DDInstall.ntx86.Services]
 AddService = ipoib, 2, IpoibService, IpoibEventLog @@ -187,6 +188,9 @@
[IpoibCopyFiles]
 ipoib.sys,,,2

+[WsdCopyFiles]
+ibwsd.dll,,,0x00000002
+
 [NdCopyFiles]
 ibndprov.dll,,,0x00000002
 ndinstall.exe,,,0x00000002
@@ -195,6 +199,9 @@
 ibwsd.dll,ibwsd32.dll,,0x00000002
 ibndprov.dll,ibndprov32.dll,,0x00000002

+[WOW64WsdCopyFiles]
+ibwsd.dll,ibwsd32.dll,,0x00000002
+
 [SourceDisksNames.x86]
 1 = %IcsDisk1%,,,""

@@ -221,15 +228,13 @@
 ipoib.sys = 1
 ibwsd.dll = 1
 ibwsd32.dll = 1
-ibndprov.dll = 1
-ibndprov32.dll = 1
-ndinstall.exe = 1

 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
 WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%
+WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%

 [Strings]