diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch (renamed from import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch) | 10 | ||||
| -rw-r--r-- | import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch | 30 |
2 files changed, 5 insertions, 35 deletions
diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch index 7e7404412..47c81dd98 100644 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch @@ -1,4 +1,4 @@ -From e20556d7cf0fc8258db77c1f3e0a160cf9fd4514 Mon Sep 17 00:00:00 2001 +From a2a656e6976a60e5df3ade0d17a40b4ebdc2b41a Mon Sep 17 00:00:00 2001 From: He Zhe <zhe.he@windriver.com> Date: Wed, 30 Mar 2016 06:23:45 -0400 Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution @@ -19,13 +19,13 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> create mode 100644 test.mk diff --git a/Makefile.am b/Makefile.am -index ed43c2f..f38d278 100644 +index a4dd7b8..0bd32c7 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -401,3 +401,4 @@ include datapath-windows/include/automake.mk - include windows/automake.mk +@@ -429,3 +429,4 @@ include windows/automake.mk include ovn/automake.mk include selinux/automake.mk + include build-aux/automake.mk +include test.mk diff --git a/test.mk b/test.mk new file mode 100644 @@ -106,5 +106,5 @@ index 0000000..b10a581 + sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite + sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite -- -1.9.1 +2.7.4 diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch deleted file mode 100644 index c75ebc50d..000000000 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2a78bddb865e0d3377f437428ed6825195af0a14 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Wed, 13 Apr 2016 03:13:01 -0400 -Subject: [PATCH] openvswitch: ptest: Fix python path - -For now PYTHON just happens to be the same as TARGET_PYTHON so we get the right -python binary. This patch sets PYTHON to TARGET_PYTHON since ptest is going to -be run on target. - -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - tests/atlocal.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/atlocal.in b/tests/atlocal.in -index 5815c6c..db2d2c9 100644 ---- a/tests/atlocal.in -+++ b/tests/atlocal.in -@@ -5,7 +5,7 @@ EGREP='@EGREP@' - PERL='@PERL@' - - if test x"$PYTHON" = x; then -- PYTHON='@PYTHON@' -+ PYTHON='@TARGET_PYTHON@' - fi - - PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH --- -1.9.1 - |
