Message ID | 20160912214707.207288-1-vsairam@vmware.com |
---|---|
State | Accepted |
Headers | show |
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Thanks, Alin. > -----Original Message----- > From: dev [mailto:dev-bounces@openvswitch.org] On Behalf Of Sairam > Venugopal > Sent: Tuesday, September 13, 2016 12:47 AM > To: dev@openvswitch.org > Subject: [ovs-dev] [PATCH v2] Windows: Update the Driver and MSI > properties > > Fix the legal notice section in OVSEXT.SYS properties. Update the MSI to > include the properties mentioned in MSDN - 'Extension driver MSI packaging > requirements' section - > https://msdn.microsoft.com/windows/hardware/drivers/network/extensio > n-driver-msi-packaging-requirements > > Signed-off-by: Sairam Venugopal <vsairam@vmware.com> > --- > datapath-windows/ovsext/ovsext.rc | 2 +- > windows/ovs-windows-installer/Product.wxs | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/datapath-windows/ovsext/ovsext.rc b/datapath- > windows/ovsext/ovsext.rc > index 8dc6882..0b92e2e 100644 > --- a/datapath-windows/ovsext/ovsext.rc > +++ b/datapath-windows/ovsext/ovsext.rc > @@ -34,7 +34,7 @@ BEGIN > VALUE "FileDescription", "Open vSwitch Extension" > VALUE "FileVersion", "6.3.9600.17298" > VALUE "InternalName", "OVSExt.SYS" > - VALUE "LegalCopyright", " Licensed under the Apache License, > Version 2.0 (the ""License"")" > + VALUE "LegalCopyright", "Licensed under the Apache License, > Version 2.0 (the ""License"")" > VALUE "OriginalFilename", "OVSExt.SYS" > VALUE "ProductName", "Open vSwitch 8/8.1 DDK driver" > VALUE "ProductVersion", "6.3.9600.17298" > diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs- > windows-installer/Product.wxs > index c1c4d4b..8b58729 100644 > --- a/windows/ovs-windows-installer/Product.wxs > +++ b/windows/ovs-windows-installer/Product.wxs > @@ -21,6 +21,12 @@ > <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open > vSwitch for Hyper-V" Language="1033" Version="1.0.0.0" > Manufacturer="Open vSwitch" UpgradeCode="da802b12-433d-4742- > a7ae-783aa0c48222"> > <Package InstallerVersion="405" Compressed="yes" > InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" /> > + > + <Property Id="Description" Value="Open vSwitch Extension" /> > + <Property Id="DriverID" Value="{583CC151-73EC-4A6A-8B47- > 578297AD7623}" /> > + <Property Id="DriverVersion" Value="6.3.9600.17298" /> > + <Property Id="ExtensionType" Value="Forwarding" /> > + > <Condition Message="This application is only supported on Windows 2012 > or higher."> > <![CDATA[Installed OR (VersionNT >= 602)]]> > </Condition> > -- > 2.9.0.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
On 12 September 2016 at 14:47, Sairam Venugopal <vsairam@vmware.com> wrote: > Fix the legal notice section in OVSEXT.SYS properties. Update the MSI to > include the properties mentioned in MSDN - 'Extension driver MSI packaging > requirements' section - > https://msdn.microsoft.com/windows/hardware/drivers/ > network/extension-driver-msi-packaging-requirements > > Signed-off-by: Sairam Venugopal <vsairam@vmware.com> > Thanks, applied to master. > --- > datapath-windows/ovsext/ovsext.rc | 2 +- > windows/ovs-windows-installer/Product.wxs | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/datapath-windows/ovsext/ovsext.rc b/datapath-windows/ovsext/ > ovsext.rc > index 8dc6882..0b92e2e 100644 > --- a/datapath-windows/ovsext/ovsext.rc > +++ b/datapath-windows/ovsext/ovsext.rc > @@ -34,7 +34,7 @@ BEGIN > VALUE "FileDescription", "Open vSwitch Extension" > VALUE "FileVersion", "6.3.9600.17298" > VALUE "InternalName", "OVSExt.SYS" > - VALUE "LegalCopyright", "� Licensed under the Apache License, > Version 2.0 (the ""License"")" > + VALUE "LegalCopyright", "Licensed under the Apache License, > Version 2.0 (the ""License"")" > VALUE "OriginalFilename", "OVSExt.SYS" > VALUE "ProductName", "Open vSwitch 8/8.1 DDK driver" > VALUE "ProductVersion", "6.3.9600.17298" > diff --git a/windows/ovs-windows-installer/Product.wxs > b/windows/ovs-windows-installer/Product.wxs > index c1c4d4b..8b58729 100644 > --- a/windows/ovs-windows-installer/Product.wxs > +++ b/windows/ovs-windows-installer/Product.wxs > @@ -21,6 +21,12 @@ > <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open > vSwitch for Hyper-V" Language="1033" Version="1.0.0.0" > Manufacturer="Open vSwitch" UpgradeCode="da802b12-433d- > 4742-a7ae-783aa0c48222"> > <Package InstallerVersion="405" Compressed="yes" > InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" /> > + > + <Property Id="Description" Value="Open vSwitch Extension" /> > + <Property Id="DriverID" Value="{583CC151-73EC-4A6A-8B47-578297AD7623}" > /> > + <Property Id="DriverVersion" Value="6.3.9600.17298" /> > + <Property Id="ExtensionType" Value="Forwarding" /> > + > <Condition Message="This application is only supported on Windows > 2012 or higher."> > <![CDATA[Installed OR (VersionNT >= 602)]]> > </Condition> > -- > 2.9.0.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev >
diff --git a/datapath-windows/ovsext/ovsext.rc b/datapath-windows/ovsext/ovsext.rc index 8dc6882..0b92e2e 100644 --- a/datapath-windows/ovsext/ovsext.rc +++ b/datapath-windows/ovsext/ovsext.rc @@ -34,7 +34,7 @@ BEGIN VALUE "FileDescription", "Open vSwitch Extension" VALUE "FileVersion", "6.3.9600.17298" VALUE "InternalName", "OVSExt.SYS" - VALUE "LegalCopyright", "� Licensed under the Apache License, Version 2.0 (the ""License"")" + VALUE "LegalCopyright", "Licensed under the Apache License, Version 2.0 (the ""License"")" VALUE "OriginalFilename", "OVSExt.SYS" VALUE "ProductName", "Open vSwitch 8/8.1 DDK driver" VALUE "ProductVersion", "6.3.9600.17298" diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index c1c4d4b..8b58729 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -21,6 +21,12 @@ <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open vSwitch for Hyper-V" Language="1033" Version="1.0.0.0" Manufacturer="Open vSwitch" UpgradeCode="da802b12-433d-4742-a7ae-783aa0c48222"> <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" /> + + <Property Id="Description" Value="Open vSwitch Extension" /> + <Property Id="DriverID" Value="{583CC151-73EC-4A6A-8B47-578297AD7623}" /> + <Property Id="DriverVersion" Value="6.3.9600.17298" /> + <Property Id="ExtensionType" Value="Forwarding" /> + <Condition Message="This application is only supported on Windows 2012 or higher."> <![CDATA[Installed OR (VersionNT >= 602)]]> </Condition>
Fix the legal notice section in OVSEXT.SYS properties. Update the MSI to include the properties mentioned in MSDN - 'Extension driver MSI packaging requirements' section - https://msdn.microsoft.com/windows/hardware/drivers/network/extension-driver-msi-packaging-requirements Signed-off-by: Sairam Venugopal <vsairam@vmware.com> --- datapath-windows/ovsext/ovsext.rc | 2 +- windows/ovs-windows-installer/Product.wxs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)