From patchwork Mon Sep 21 01:32:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368017 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 4Bvn506zPwz9sSn for ; Mon, 21 Sep 2020 11:33:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F20CC86851; Mon, 21 Sep 2020 01:33:06 +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 tMqO+HolelVO; Mon, 21 Sep 2020 01:33:06 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 3507D86844; Mon, 21 Sep 2020 01:33:06 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 17FC3C0859; Mon, 21 Sep 2020 01:33:06 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id AB5F3C0859 for ; Mon, 21 Sep 2020 01:33:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9452586850 for ; Mon, 21 Sep 2020 01:33:03 +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 Zk8HuoT4q7mM for ; Mon, 21 Sep 2020 01:33:01 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 3448386844 for ; Mon, 21 Sep 2020 01:33:01 +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 3F8A5C0002; Mon, 21 Sep 2020 01:32:56 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:34 +0300 Message-Id: <20200921013241.654-1-aserdean@cloudbasesolutions.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH v2 1/8] windows: Remove unused variable 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" Found by inspection. Signed-off-by: Alin Gabriel Serdean --- windows/automake.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/windows/automake.mk b/windows/automake.mk index 80dca1467..49c8985fd 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -PTHREAD_TEMP_DIR=`echo "$(PTHREAD_LDFLAGS)" | sed 's|^.\(.*\).$:\1||'` windows_installer: all #Userspace files needed for the installer cp -f $(top_srcdir)/datapath-windows/misc/OVS.psm1 windows/ovs-windows-installer/Services/OVS.psm1 From patchwork Mon Sep 21 01:32:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368020 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn5B1Nx9z9sSt for ; Mon, 21 Sep 2020 11:33:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6E1318718C; Mon, 21 Sep 2020 01:33:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hIfCt6u7qThp; Mon, 21 Sep 2020 01:33:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 5BA96871A7; Mon, 21 Sep 2020 01:33:08 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1F355C0893; Mon, 21 Sep 2020 01:33:08 +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 3BE14C0051 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 22FF685F4B 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 Co-7_qJ1yIBL for ; Mon, 21 Sep 2020 01:33:02 +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 17AB785F43 for ; Mon, 21 Sep 2020 01:33:01 +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 DF43AC0003; Mon, 21 Sep 2020 01:32:57 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:35 +0300 Message-Id: <20200921013241.654-2-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 2/8] windows: Add default value for VSTUDIO_CONFIG 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" VSTUDIO_CONFIG is used when generating the windows installer. If the parameter passed to configure `--with-vstudiotarget` is not specified to configure we default it to `Default`. Fixes bug: vstudiotarget/vstudiotargetver should be available only on Windows. Signed-off-by: Alin Gabriel Serdean --- m4/openvswitch.m4 | 93 ++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 6fe79297e..31b0f56b0 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -146,52 +146,53 @@ dnl OVS_CHECK_WINDOWS dnl dnl Configure Visual Studio solution build AC_DEFUN([OVS_CHECK_VISUAL_STUDIO_DDK], [ -AC_ARG_WITH([vstudiotarget], - [AS_HELP_STRING([--with-vstudiotarget=target_type], - [Target type: Debug/Release])], - [ - case "$withval" in - "Release") ;; - "Debug") ;; - *) AC_MSG_ERROR([No valid Visual Studio configuration found]) ;; - esac - - VSTUDIO_CONFIG=$withval - ], [ - VSTUDIO_CONFIG= - ] - ) - - AC_SUBST([VSTUDIO_CONFIG]) - -AC_ARG_WITH([vstudiotargetver], - [AS_HELP_STRING([--with-vstudiotargetver=target_ver1,target_ver2], - [Target versions: Win8,Win8.1,Win10])], - [ - targetver=`echo "$withval" | tr -s , ' ' ` - for ver in $targetver; do - case "$ver" in - "Win8") VSTUDIO_WIN8=true ;; - "Win8.1") VSTUDIO_WIN8_1=true ;; - "Win10") VSTUDIO_WIN10=true ;; - *) AC_MSG_ERROR([No valid Visual Studio target version found]) ;; - esac - done - - ], [ - VSTUDIO_WIN8=true - VSTUDIO_WIN8_1=true - VSTUDIO_WIN10=true - ] - ) - - AM_CONDITIONAL([VSTUDIO_WIN8], [test -n "$VSTUDIO_WIN8"]) - AM_CONDITIONAL([VSTUDIO_WIN8_1], [test -n "$VSTUDIO_WIN8_1"]) - AM_CONDITIONAL([VSTUDIO_WIN10], [test -n "$VSTUDIO_WIN10"]) - - AC_DEFINE([VSTUDIO_DDK], [1], [System uses the Visual Studio build target.]) - AM_CONDITIONAL([VSTUDIO_DDK], [test -n "$VSTUDIO_CONFIG"]) -]) +if test "$WIN32" = yes; then + AC_ARG_WITH([vstudiotarget], + [AS_HELP_STRING([--with-vstudiotarget=target_type], + [Target type: Debug/Release])], + [ + case "$withval" in + "Release") ;; + "Debug") ;; + *) AC_MSG_ERROR([No valid Visual Studio configuration found]) ;; + esac + + VSTUDIO_CONFIG=$withval + ], [ + VSTUDIO_CONFIG="Debug" + ] + ) + + AC_SUBST([VSTUDIO_CONFIG]) + + AC_ARG_WITH([vstudiotargetver], + [AS_HELP_STRING([--with-vstudiotargetver=target_ver1,target_ver2], + [Target versions: Win8,Win8.1,Win10])], + [ + targetver=`echo "$withval" | tr -s , ' ' ` + for ver in $targetver; do + case "$ver" in + "Win8") VSTUDIO_WIN8=true ;; + "Win8.1") VSTUDIO_WIN8_1=true ;; + "Win10") VSTUDIO_WIN10=true ;; + *) AC_MSG_ERROR([No valid Visual Studio target version found]) ;; + esac + done + + ], [ + VSTUDIO_WIN8=true + VSTUDIO_WIN8_1=true + VSTUDIO_WIN10=true + ] + ) + + AM_CONDITIONAL([VSTUDIO_WIN8], [test -n "$VSTUDIO_WIN8"]) + AM_CONDITIONAL([VSTUDIO_WIN8_1], [test -n "$VSTUDIO_WIN8_1"]) + AM_CONDITIONAL([VSTUDIO_WIN10], [test -n "$VSTUDIO_WIN10"]) + + AC_DEFINE([VSTUDIO_DDK], [1], [System uses the Visual Studio build target.]) + AM_CONDITIONAL([VSTUDIO_DDK], [test -n "$VSTUDIO_CONFIG"]) +fi]) dnl Checks for Netlink support. AC_DEFUN([OVS_CHECK_NETLINK], From patchwork Mon Sep 21 01:32:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368022 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn5C2zmhz9sSt for ; Mon, 21 Sep 2020 11:33:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 40494871F2; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pn4igUl9K7i7; Mon, 21 Sep 2020 01:33:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 39F8B871AE; Mon, 21 Sep 2020 01:33:09 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0D863C0893; Mon, 21 Sep 2020 01:33:09 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 61FD4C0051 for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E1A887178 for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dnvRjvyueL2f for ; Mon, 21 Sep 2020 01:33:02 +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 hemlock.osuosl.org (Postfix) with ESMTPS id 7ED148716D for ; Mon, 21 Sep 2020 01:33:02 +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 A1469C0004; Mon, 21 Sep 2020 01:32:58 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:36 +0300 Message-Id: <20200921013241.654-3-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 3/8] datapath_windows: Add datapath_windows target 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" It is useful to build the latest supported version of the driver using the `make` command. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/automake.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk index b8cf5dd95..60b3d6033 100644 --- a/datapath-windows/automake.mk +++ b/datapath-windows/automake.mk @@ -90,3 +90,7 @@ datapath_windows_analyze: all MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Analyze" MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1Analyze" MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8Analyze" + +datapath_windows: all + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Debug" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Release" From patchwork Mon Sep 21 01:32:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368018 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn541trHz9sSn for ; Mon, 21 Sep 2020 11:33:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 293A985F4D; Mon, 21 Sep 2020 01:33:08 +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 VEuXiQAa3vdL; Mon, 21 Sep 2020 01:33:07 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6DE9885F54; Mon, 21 Sep 2020 01:33:07 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0A2ADC0893; Mon, 21 Sep 2020 01:33:07 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id A9F69C0051 for ; Mon, 21 Sep 2020 01:33:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 916758684B for ; Mon, 21 Sep 2020 01:33:03 +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 hOJ1JBpKFfVR for ; Mon, 21 Sep 2020 01:33:01 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 4363C86847 for ; Mon, 21 Sep 2020 01:33:01 +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 5EAAAC0006; Mon, 21 Sep 2020 01:32:59 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:37 +0300 Message-Id: <20200921013241.654-4-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 4/8] windows, documentation: Recommend latest VS and WDK version 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" Found by inspection. Signed-off-by: Alin Gabriel Serdean --- Documentation/intro/install/windows.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst index 394572f00..4c7724b57 100644 --- a/Documentation/intro/install/windows.rst +++ b/Documentation/intro/install/windows.rst @@ -73,6 +73,9 @@ The following explains the steps in some detail. binaries. In addition to that, if you want to compile the kernel module you will also need to install Windows Driver Kit (WDK) 8.1 Update. + We recommend using the latest Visual Studio version together with the latest + WDK installed. + It is important to get the Visual Studio related environment variables and to have the $PATH inside the bash to point to the proper compiler and linker. One easy way to achieve this for VS2013 is to get into the "VS2013 x86 Native From patchwork Mon Sep 21 01:32:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368021 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn5B6JRqz9sSn for ; Mon, 21 Sep 2020 11:33:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BA6E485FA6; Mon, 21 Sep 2020 01:33:15 +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 beHLSlch8_PX; Mon, 21 Sep 2020 01:33:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3149085FC1; Mon, 21 Sep 2020 01:33:13 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F2F5DC0895; Mon, 21 Sep 2020 01:33:12 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 879ABC0859 for ; Mon, 21 Sep 2020 01:33:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 040EB2040D for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ytN3HXEKiykw for ; Mon, 21 Sep 2020 01:33:02 +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 silver.osuosl.org (Postfix) with ESMTPS id 35894203FD for ; Mon, 21 Sep 2020 01:33:01 +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 1FD70C0007; Mon, 21 Sep 2020 01:32:59 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:38 +0300 Message-Id: <20200921013241.654-5-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 5/8] windows, installer: Bundle latest runtime version 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" Until now we were bundling MSVC120 x86 runtime. This patch changes it too the latest version and also add the 64 bit version of it. Signed-off-by: Alin Gabriel Serdean --- windows/automake.mk | 3 ++- windows/ovs-windows-installer/Product.wxs | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/windows/automake.mk b/windows/automake.mk index 49c8985fd..ce1fac66c 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -26,7 +26,8 @@ windows_installer: all cp -f $(top_srcdir)/ovsdb/ovsdb-tool.pdb windows/ovs-windows-installer/Symbols/ #Third party files needed by the installer cp -f $(PTHREAD_WIN32_DIR_DLL_WIN_FORM)/*.dll windows/ovs-windows-installer/Binaries/ - cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC120_CRT_x86.msm" windows/ovs-windows-installer/Redist/Microsoft_VC120_CRT_x86.msm + cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x86.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x86.msm + cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x64.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x64.msm #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 diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index ea1bc6896..d722fe927 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -51,9 +51,13 @@ - - + + + + @@ -260,7 +264,8 @@ - + + From patchwork Mon Sep 21 01:32:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368019 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn593JkPz9sSn for ; Mon, 21 Sep 2020 11:33:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E2CA585F66; Mon, 21 Sep 2020 01:33:13 +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 BadPXHTLWByV; Mon, 21 Sep 2020 01:33:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1C44685F98; Mon, 21 Sep 2020 01:33:11 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D952DC0893; Mon, 21 Sep 2020 01:33:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 93BEEC0051 for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 811958716D for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OyPIRrKIDdAe 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 hemlock.osuosl.org (Postfix) with ESMTPS id B6F4B87176 for ; Mon, 21 Sep 2020 01:33:02 +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 D192BC0008; Mon, 21 Sep 2020 01:33:00 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:39 +0300 Message-Id: <20200921013241.654-6-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 6/8] windows: Update build with latest pthread project 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" pthreads-win32 has moved too PThreads4W. This patch updates the build steps, CI (appveyor) and documentation. Signed-off-by: Alin Gabriel Serdean --- Documentation/intro/install/windows.rst | 10 +++++----- appveyor.yml | 18 +++++++----------- m4/openvswitch.m4 | 19 ++++--------------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst index 4c7724b57..dd7af4015 100644 --- a/Documentation/intro/install/windows.rst +++ b/Documentation/intro/install/windows.rst @@ -95,13 +95,13 @@ The following explains the steps in some detail. Visual studio's linker is used. You should also see a 'which sort' report ``/bin/sort.exe``. -- pthreads-win32 +- PThreads4W - For pthread support, install the library, dll and includes of pthreads-win32 + For pthread support, install the library, dll and includes of PThreads4W project from `sourceware - `__ to a - directory (e.g.: ``C:/pthread``). You should add the pthread-win32's dll path - (e.g.: ``C:\pthread\dll\x86``) to the Windows' PATH environment variable. + `__ to a directory + (e.g.: ``C:/pthread``). You should add the PThreads4W's dll path + (e.g.: ``C:\pthread\bin``) to the Windows' PATH environment variable. - OpenSSL diff --git a/appveyor.yml b/appveyor.yml index fa6754ce2..6e2b2e9e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,5 @@ version: 1.0.{build} +image: Visual Studio 2019 branches: only: - master @@ -7,16 +8,8 @@ init: - ps: $env:PATH ="C:\Python37;"+$env:PATH - ps: New-Item -Type HardLink -Path "C:\Python37\python3.exe" -Value "C:\Python37\python.exe" - ps: >- - mkdir C:\pthreads-win32 - mkdir C:\ovs-build-downloads - $source = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip" - - $destination = "C:\pthreads-win32\pthreads-win32.zip" - - Invoke-WebRequest $source -OutFile $destination - $source = "https://slproweb.com/download/Win32OpenSSL-1_0_2t.exe" $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2t.exe" @@ -35,14 +28,17 @@ init: cd C:\openvswitch + git clone https://git.code.sf.net/p/pthreads4w/code c:\pthreads4w-code + python3 -m pip install pypiwin32 --disable-pip-version-check build_script: -- '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd"' +- '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' - C:\MinGW\msys\1.0\bin\bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab" -- C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/dll/x86/*.dll /c/openvswitch/." - C:\MinGW\msys\1.0\bin\bash -lc "mv /bin/link.exe /bin/link_copy.exe" +# Build pthreads +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/pthreads4w-code && nmake all install" - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./boot.sh" -- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --with-pthread=C:/pthreads-win32/Pre-built.2 --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"Debug\" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --with-pthread=c:/PTHREADS-BUILT/ --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"Debug\" - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make" - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make datapath_windows_analyze" diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 31b0f56b0..e0ed1dbf5 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -95,23 +95,12 @@ AC_DEFUN([OVS_CHECK_WIN32], AC_MSG_ERROR([Invalid --with-pthread value]) ;; *) - if (cl) 2>&1 | grep 'x64' >/dev/null 2>&1; then - cl_cv_x64=yes - else - cl_cv_x64=no - fi - if test "$cl_cv_x64" = yes; then - PTHREAD_WIN32_DIR=$withval/lib/x64 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x64 - PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x64 - else - PTHREAD_WIN32_DIR=$withval/lib/x86 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x86 - PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x86 - fi + PTHREAD_WIN32_DIR=$withval/lib + PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/bin + PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/bin PTHREAD_INCLUDES=-I$withval/include PTHREAD_LDFLAGS=-L$PTHREAD_WIN32_DIR - PTHREAD_LIBS="-lpthreadVC2" + PTHREAD_LIBS="-lpthreadVC3" AC_SUBST([PTHREAD_WIN32_DIR_DLL_WIN_FORM]) AC_SUBST([PTHREAD_WIN32_DIR_DLL]) AC_SUBST([PTHREAD_INCLUDES]) 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]]> + + + + From patchwork Mon Sep 21 01:32:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368023 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn5C3PM9z9sTQ for ; Mon, 21 Sep 2020 11:33:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E8EA785FD6; Mon, 21 Sep 2020 01:33:16 +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 7WpZmqqVzPo9; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5F78385FEB; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3AE24C0895; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id A0953C0890 for ; Mon, 21 Sep 2020 01:33:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8FA1D204B0 for ; Mon, 21 Sep 2020 01:33:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDfpGf48cDVF for ; Mon, 21 Sep 2020 01:33:05 +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 silver.osuosl.org (Postfix) with ESMTPS id AD3351FD7D for ; Mon, 21 Sep 2020 01:33:04 +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 564BEC000A; Mon, 21 Sep 2020 01:33:02 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:41 +0300 Message-Id: <20200921013241.654-8-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 Cc: Yonggang Luo , Jinjun Gao Subject: [ovs-dev] [PATCH v2 8/8] appveyor: Bump outdated links and add artifacts 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" Bump OpenSSL. Add release and debug configuration. Build and add Windows installer to generated artifacts. Build and zip prebuilt version. Co-authored-by: Yonggang Luo Signed-off-by: Yonggang Luo Co-authored-by: Jinjun Gao Signed-off-by: Jinjun Gao Signed-off-by: Alin Gabriel Serdean --- appveyor.yml | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6e2b2e9e2..25c3f69fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,26 +3,27 @@ image: Visual Studio 2019 branches: only: - master -clone_folder: C:\openvswitch +configuration: + - Debug + - Release +clone_folder: C:\openvswitch_compile init: - ps: $env:PATH ="C:\Python37;"+$env:PATH - ps: New-Item -Type HardLink -Path "C:\Python37\python3.exe" -Value "C:\Python37\python.exe" - ps: >- mkdir C:\ovs-build-downloads - $source = "https://slproweb.com/download/Win32OpenSSL-1_0_2t.exe" + mkdir C:\openvswitch\driver - $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2t.exe" + $source = "https://slproweb.com/download/Win64OpenSSL-1_0_2u.exe" - Invoke-WebRequest $source -OutFile $destination - - cd C:\pthreads-win32 + $destination = "C:\ovs-build-downloads\Win64OpenSSL-1_0_2u.exe" - 7z x C:\pthreads-win32\pthreads-win32.zip + Invoke-WebRequest $source -OutFile $destination cd C:\ovs-build-downloads - .\Win32OpenSSL-1_0_2t.exe /silent /verysilent /sp- /suppressmsgboxes + .\Win64OpenSSL-1_0_2u.exe /silent /verysilent /sp- /suppressmsgboxes Start-Sleep -s 30 @@ -32,13 +33,28 @@ init: python3 -m pip install pypiwin32 --disable-pip-version-check + cd C:\openvswitch_compile + build_script: - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' - C:\MinGW\msys\1.0\bin\bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab" - C:\MinGW\msys\1.0\bin\bash -lc "mv /bin/link.exe /bin/link_copy.exe" # Build pthreads - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/pthreads4w-code && nmake all install" -- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./boot.sh" -- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --with-pthread=c:/PTHREADS-BUILT/ --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"Debug\" -- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make" -- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make datapath_windows_analyze" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && ./boot.sh" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --prefix=C:/openvswitch/usr --localstatedir=C:/openvswitch/var --sysconfdir=C:/openvswitch/etc --with-pthread=c:/PTHREADS-BUILT/ --enable-ssl --with-openssl=C:/OpenSSL-Win64 --with-vstudiotarget=\"%CONFIGURATION%\"" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make -j 4" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make datapath_windows_analyze" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make install" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make windows_installer" +- cp C:\PTHREADS-BUILT\bin\pthreadVC3.dll C:\openvswitch\usr\bin +- cp C:\PTHREADS-BUILT\bin\pthreadVC3.dll C:\openvswitch\usr\sbin +- ps: cp C:\openvswitch_compile\datapath-windows\x64\Win10$env:CONFIGURATION\package\* C:\openvswitch\driver +- ps: cp C:\openvswitch_compile\datapath-windows\x64\Win10$env:CONFIGURATION\package.cer C:\openvswitch\driver +- ps: cp C:\openvswitch_compile\datapath-windows\misc\* C:\openvswitch\driver +- cp c:\openvswitch_compile\windows\ovs-windows-installer\bin\x64\Release\OpenvSwitch.msi c:\OpenvSwitch-%CONFIGURATION%.msi + +after_build: + - ps: 7z a C:\ovs-master-$env:CONFIGURATION.zip C:\openvswitch + - ps: Push-AppveyorArtifact C:\ovs-master-$env:CONFIGURATION.zip + - ps: Push-AppveyorArtifact C:\OpenvSwitch-$env:CONFIGURATION.msi