summaryrefslogtreecommitdiffstats
path: root/recipes-networking
diff options
context:
space:
mode:
authorJim Somerville <Jim.Somerville@windriver.com>2014-02-04 16:17:50 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-02-05 11:53:13 -0500
commit9e5a34e8cd2bbcd9189cd113cbc4be668269814b (patch)
tree89e561f56d155e1acdd552f8d590a7ea62c32b47 /recipes-networking
parentc72df0a2d18d57189e13749f52c65bb1d3e3a6eb (diff)
downloadmeta-virtualization-9e5a34e8cd2bbcd9189cd113cbc4be668269814b.tar.gz
openvswitch: add more target python substitutions
The TARGET_PYTHON variable is used for script substitutions to ensure the scripts will be able to properly execute if the target system has a different path for the python. Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-networking')
-rw-r--r--recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch50
-rw-r--r--recipes-networking/openvswitch/openvswitch_2.0.0.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch b/recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch
new file mode 100644
index 00000000..2b87a116
--- /dev/null
+++ b/recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch
@@ -0,0 +1,50 @@
1From d1ab2f62a03c2c977de6fed5fca8de63e328a870 Mon Sep 17 00:00:00 2001
2Message-Id: <d1ab2f62a03c2c977de6fed5fca8de63e328a870.1391527986.git.Jim.Somerville@windriver.com>
3From: Jim Somerville <Jim.Somerville@windriver.com>
4Date: Tue, 4 Feb 2014 15:30:41 +0000
5Subject: [PATCH 1/1] openvswitch: add more target python substitutions
6
7The TARGET_PYTHON variable is used for script
8substitutions to ensure the scripts will be able to properly execute
9if the target system has a different path for the python.
10
11Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
12---
13 ovsdb/ovsdb-dot.in | 2 +-
14 ovsdb/ovsdb-idlc.in | 2 +-
15 utilities/ovs-dpctl-top.in | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in
19index 85c126d..402a77c 100755
20--- a/ovsdb/ovsdb-dot.in
21+++ b/ovsdb/ovsdb-dot.in
22@@ -1,4 +1,4 @@
23-#! @PYTHON@
24+#! @TARGET_PYTHON@
25
26 from datetime import date
27 import ovs.db.error
28diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
29index ec1c655..f5c135f 100755
30--- a/ovsdb/ovsdb-idlc.in
31+++ b/ovsdb/ovsdb-idlc.in
32@@ -1,4 +1,4 @@
33-#! @PYTHON@
34+#! @TARGET_PYTHON@
35
36 import getopt
37 import os
38diff --git a/utilities/ovs-dpctl-top.in b/utilities/ovs-dpctl-top.in
39index f43fdeb..8475118 100755
40--- a/utilities/ovs-dpctl-top.in
41+++ b/utilities/ovs-dpctl-top.in
42@@ -1,4 +1,4 @@
43-#! @PYTHON@
44+#! @TARGET_PYTHON@
45 #
46 # Copyright (c) 2013 Nicira, Inc.
47 #
48--
491.8.3.4
50
diff --git a/recipes-networking/openvswitch/openvswitch_2.0.0.bb b/recipes-networking/openvswitch/openvswitch_2.0.0.bb
index 0ca707ed..15c4dcaf 100644
--- a/recipes-networking/openvswitch/openvswitch_2.0.0.bb
+++ b/recipes-networking/openvswitch/openvswitch_2.0.0.bb
@@ -26,6 +26,7 @@ SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \
26 file://openvswitch-controller-setup \ 26 file://openvswitch-controller-setup \
27 file://openvswitch-add-target-python-handling.patch \ 27 file://openvswitch-add-target-python-handling.patch \
28 file://openvswitch-add-target-perl-handling.patch \ 28 file://openvswitch-add-target-perl-handling.patch \
29 file://openvswitch-add-more-target-python-substitutions.patch \
29 " 30 "
30 31
31SRC_URI[md5sum] = "7d7a58350e634e515e0fe43c64d64f44" 32SRC_URI[md5sum] = "7d7a58350e634e515e0fe43c64d64f44"