diff options
-rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch | 30 | ||||
-rw-r--r-- | recipes-networking/openvswitch/openvswitch_git.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch new file mode 100644 index 00000000..c75ebc50 --- /dev/null +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 2a78bddb865e0d3377f437428ed6825195af0a14 Mon Sep 17 00:00:00 2001 | ||
2 | From: He Zhe <zhe.he@windriver.com> | ||
3 | Date: Wed, 13 Apr 2016 03:13:01 -0400 | ||
4 | Subject: [PATCH] openvswitch: ptest: Fix python path | ||
5 | |||
6 | For now PYTHON just happens to be the same as TARGET_PYTHON so we get the right | ||
7 | python binary. This patch sets PYTHON to TARGET_PYTHON since ptest is going to | ||
8 | be run on target. | ||
9 | |||
10 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
11 | --- | ||
12 | tests/atlocal.in | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/tests/atlocal.in b/tests/atlocal.in | ||
16 | index 5815c6c..db2d2c9 100644 | ||
17 | --- a/tests/atlocal.in | ||
18 | +++ b/tests/atlocal.in | ||
19 | @@ -5,7 +5,7 @@ EGREP='@EGREP@' | ||
20 | PERL='@PERL@' | ||
21 | |||
22 | if test x"$PYTHON" = x; then | ||
23 | - PYTHON='@PYTHON@' | ||
24 | + PYTHON='@TARGET_PYTHON@' | ||
25 | fi | ||
26 | |||
27 | PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH | ||
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index 2f7fe3e1..b46d5af4 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb | |||
@@ -24,6 +24,7 @@ SRC_URI += "\ | |||
24 | file://run-ptest \ | 24 | file://run-ptest \ |
25 | file://disable_m4_check.patch \ | 25 | file://disable_m4_check.patch \ |
26 | file://kernel_module.patch \ | 26 | file://kernel_module.patch \ |
27 | file://openvswitch-ptest-Fix-python-path.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | LIC_FILES_CHKSUM = "file://COPYING;md5=247d8817aece26b21a8cd6791b3ea994" | 30 | LIC_FILES_CHKSUM = "file://COPYING;md5=247d8817aece26b21a8cd6791b3ea994" |