From patchwork Mon Sep 21 01:32:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cloudbasesolutions.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn5G6d2bz9sSn for ; Mon, 21 Sep 2020 11:33:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7294486789; Mon, 21 Sep 2020 01:33:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vy9G9KTyvoYA; Mon, 21 Sep 2020 01:33:12 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A0B386891; Mon, 21 Sep 2020 01:33:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E7490C0895; Mon, 21 Sep 2020 01:33:09 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 799BEC0859 for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7136385F43 for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fde2mKCvW305 for ; Mon, 21 Sep 2020 01:33:03 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6CE1185F45 for ; Mon, 21 Sep 2020 01:33:03 +0000 (UTC) X-Originating-IP: 89.137.184.67 Received: from localhost.localdomain (unknown [89.137.184.67]) (Authenticated sender: aserdean@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 8DF95C0009; Mon, 21 Sep 2020 01:33:01 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:40 +0300 Message-Id: <20200921013241.654-7-aserdean@cloudbasesolutions.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200921013241.654-1-aserdean@cloudbasesolutions.com> References: <20200921013241.654-1-aserdean@cloudbasesolutions.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH v2 7/8] windows, installer: Bundle Windows 10 driver X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch bundles the Windows 10 driver family in the installer and also adds detection for the family. Signed-off-by: Alin Gabriel Serdean --- windows/automake.mk | 5 ++++- windows/ovs-windows-installer/Driver/.gitignore | 1 + .../ovs-windows-installer/Driver/Win10/.gitignore | 3 +++ windows/ovs-windows-installer/Product.wxs | 12 +++++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 windows/ovs-windows-installer/Driver/Win10/.gitignore diff --git a/windows/automake.mk b/windows/automake.mk index ce1fac66c..489343028 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -31,10 +31,13 @@ windows_installer: all #Forwarding extension files needed for the installer cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8/ovsext.cat cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/OVSExt.sys windows/ovs-windows-installer/Driver/Win8/OVSExt.sys + cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/OVSExt.sys windows/ovs-windows-installer/Driver/Win8/ovsext.sys cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8.1/ovsext.cat cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8.1/ovsext.inf cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win8.1/ovsext.sys + cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win10/ovsext.cat + cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win10/ovsext.inf + cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win10/ovsext.sys MSBuild.exe windows/ovs-windows-installer.sln //nologo //target:Build //p:Configuration="Release" //p:Version="$(PACKAGE_VERSION)" //p:Platform=$(PLATFORM) EXTRA_DIST += \ diff --git a/windows/ovs-windows-installer/Driver/.gitignore b/windows/ovs-windows-installer/Driver/.gitignore index e9994b37d..3de517016 100644 --- a/windows/ovs-windows-installer/Driver/.gitignore +++ b/windows/ovs-windows-installer/Driver/.gitignore @@ -3,3 +3,4 @@ !.gitignore !Win8 !Win8.1 +!Win10 diff --git a/windows/ovs-windows-installer/Driver/Win10/.gitignore b/windows/ovs-windows-installer/Driver/Win10/.gitignore new file mode 100644 index 000000000..cec9082b6 --- /dev/null +++ b/windows/ovs-windows-installer/Driver/Win10/.gitignore @@ -0,0 +1,3 @@ +* + +!.gitignore diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index d722fe927..61289da6b 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -36,6 +36,9 @@ + + + = 602)]]> @@ -65,6 +68,7 @@ Description="Installs the Open vSwitch Hyper-V switch extension driver." Display="expand"> + @@ -254,11 +258,17 @@ - + + + 10000]]> + + + +