mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
f0f0453984
While attempting to get ovs to be built and run with py3 (completely free of py2) host contamination was found (builds on hosts without python-six installed would fail). It was also determined that pyc files were still being generated with py2 and not py3. This resulted in more work being done to achieve the desired results. This work was sent upstream and subsequently merged. Unfortunately this didn't make v2.7.1 and may not be available until the next major release, so here we backport these commits and adjust the recipe to get a clean py3 only build. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
57 lines
1.2 KiB
Diff
57 lines
1.2 KiB
Diff
From 3a9fcf1c8f60c160c282c9755ee1c7f9f7e113c3 Mon Sep 17 00:00:00 2001
|
|
From: Jason Wessel <jason.wessel@windriver.com>
|
|
Date: Thu, 29 Jun 2017 20:33:23 -0700
|
|
Subject: [PATCH 6/8] Python3 compatibility: math error compatibility
|
|
|
|
Commit 3fa5aa4294377e0f35267936d0c5caea3e61db48 from
|
|
https://github.com/openvswitch/ovs.git
|
|
|
|
The way math is handled with typing is completely different in python3.
|
|
|
|
% python2<<EOF
|
|
x=10
|
|
y=8
|
|
print((x + (y - 1)) / y * y)
|
|
EOF
|
|
16
|
|
|
|
python3<<EOF
|
|
x=10
|
|
y=8
|
|
print((x + (y - 1)) / y * y)
|
|
EOF
|
|
17.0
|
|
|
|
So we need to force an integer for the round function as follows and
|
|
maintain compatibility with python2.
|
|
|
|
python3<<EOF
|
|
x=10
|
|
y=8
|
|
print(int((x + (y - 1)) / y) * y)
|
|
EOF
|
|
16
|
|
|
|
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
|
|
Signed-off-by: Ben Pfaff <blp@ovn.org>
|
|
---
|
|
build-aux/extract-ofp-actions | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
|
|
index c11297c..bd7131f 100755
|
|
--- a/build-aux/extract-ofp-actions
|
|
+++ b/build-aux/extract-ofp-actions
|
|
@@ -35,7 +35,7 @@ line = ""
|
|
arg_structs = set()
|
|
|
|
def round_up(x, y):
|
|
- return (x + (y - 1)) / y * y
|
|
+ return int((x + (y - 1)) / y) * y
|
|
|
|
def open_file(fn):
|
|
global file_name
|
|
--
|
|
2.5.0
|
|
|