mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
e47cd6f12e
The current version (v2.9.3) started to fail to build due to changes in openssl. Upstream must have run into similar issues as this was identified and addressed in v2.10.0 by including a copy of 'dhparams.c' instead of relying on it being generated. (see commit "dhparams: Add pregenerated .c file to the repository.") Additionally v2.10.0 is better aligned for our kernel and dpdk versions: kernel === 2.10.x 3.10 to 4.17 dpdk === 2.10.x 17.11.3 The changes in this commit allow for the building of v2.10.0. A second commit will be necessary to deal with a few runtime changes which prevent ovsdb-server from starting correctly. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
101 lines
3.7 KiB
Diff
101 lines
3.7 KiB
Diff
From 098d3927e928362f0ac60ea97e9c39b73871be21 Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Wed, 3 May 2017 10:39:12 -0400
|
|
Subject: [PATCH] python: switch remaining scripts to use python3
|
|
|
|
Work to remove the main openvswitch package's dependency on python 2.
|
|
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
|
|
---
|
|
ofproto/ipfix-gen-entities | 2 +-
|
|
tests/test-l7.py | 2 +-
|
|
utilities/checkpatch.py | 2 +-
|
|
utilities/ovs-dev.py | 2 +-
|
|
utilities/ovs-pipegen.py | 2 +-
|
|
xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 2 +-
|
|
xenserver/opt_xensource_libexec_interface-reconfigure | 2 +-
|
|
xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync | 2 +-
|
|
8 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/ofproto/ipfix-gen-entities b/ofproto/ipfix-gen-entities
|
|
index 0be7199..d2cce42 100755
|
|
--- a/ofproto/ipfix-gen-entities
|
|
+++ b/ofproto/ipfix-gen-entities
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/env python
|
|
+#! /usr/bin/env python3
|
|
#
|
|
# Copyright (C) 2012 Nicira, Inc.
|
|
#
|
|
diff --git a/tests/test-l7.py b/tests/test-l7.py
|
|
index d7854a1..f09defb 100755
|
|
--- a/tests/test-l7.py
|
|
+++ b/tests/test-l7.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
# Copyright (c) 2015, 2016 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py
|
|
index f929714..e17a1cf 100755
|
|
--- a/utilities/checkpatch.py
|
|
+++ b/utilities/checkpatch.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
# Copyright (c) 2016, 2017 Red Hat, Inc.
|
|
# Copyright (c) 2018 Nicira, Inc.
|
|
#
|
|
diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
|
|
index 9ce0f04..839e13e 100755
|
|
--- a/utilities/ovs-dev.py
|
|
+++ b/utilities/ovs-dev.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
# Copyright (c) 2013, 2014, 2015, 2016 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
diff --git a/utilities/ovs-pipegen.py b/utilities/ovs-pipegen.py
|
|
index ee57972..e9b99f5 100755
|
|
--- a/utilities/ovs-pipegen.py
|
|
+++ b/utilities/ovs-pipegen.py
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/env python
|
|
+#! /usr/bin/env python3
|
|
# Copyright (c) 2013, 2014, 2015 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
|
|
index e7404e3..5edad76 100755
|
|
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
|
|
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
#
|
|
# xapi plugin script to update the cache of configuration items in the
|
|
# ovs-vswitchd configuration that are managed in the xapi database when
|
|
diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
|
|
index a82043f..9c20725 100755
|
|
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
|
|
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
#
|
|
# Copyright (c) 2008,2009 Citrix Systems, Inc.
|
|
#
|
|
diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
|
|
index ecd6f6d..b8f2a42 100755
|
|
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
|
|
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/env python
|
|
+#! /usr/bin/env python3
|
|
# Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|