diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:59:38 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:32 +0000 |
| commit | d849ec78de728ef9a2d383b92ccfeabf40f8f1d0 (patch) | |
| tree | 3f856aa8d0f07fb207894822f4ba5db495ce0b1b /import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch | |
| parent | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (diff) | |
| download | talos-openbmc-d849ec78de728ef9a2d383b92ccfeabf40f8f1d0.tar.gz talos-openbmc-d849ec78de728ef9a2d383b92ccfeabf40f8f1d0.zip | |
Squashed 'import-layers/meta-virtualization/' content from commit c4a1711
Change-Id: I42132e4f0aef12ec265e74d95f489a6409e22f46
git-subtree-dir: import-layers/meta-virtualization
git-subtree-split: c4a1711dd31659b027c70c07e4ef6da98591ac95
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch new file mode 100644 index 000000000..98224b422 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch @@ -0,0 +1,48 @@ +From 569ac1066cd3046b8ac899153df9f07908d45145 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Fri, 21 Jun 2013 11:16:00 -0400 +Subject: [PATCH] openvswitch: add target perl handling + +Allow the build to specify a path for the perl instead of reusing +the PERL variable which can lead to inconsistencies if we are cross +compiling. The TARGET_PERL variable will be used for script +substitutions to ensure the scripts will be able to properly execute +if the target system has a different path for the perl. + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + Makefile.am | 1 + + configure.ac | 7 +++++++ + utilities/ovs-parse-leaks.in | 2 +- + 3 files changed, 9 insertions(+), 1 deletion(-) + +Index: openvswitch-2.0.0/Makefile.am +=================================================================== +--- openvswitch-2.0.0.orig/Makefile.am ++++ openvswitch-2.0.0/Makefile.am +@@ -114,6 +114,7 @@ + -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ + -e 's,[@]DBDIR[@],$(DBDIR),g' \ + -e 's,[@]PERL[@],$(PERL),g' \ ++ -e 's,[@]TARGET_PERL[@],$(TARGET_PERL),g' \ + -e 's,[@]PYTHON[@],$(PYTHON),g' \ + -e 's,[@]TARGET_PYTHON[@],$(TARGET_PYTHON),g' \ + -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ +Index: openvswitch-2.0.0/configure.ac +=================================================================== +--- openvswitch-2.0.0.orig/configure.ac ++++ openvswitch-2.0.0/configure.ac +@@ -115,6 +115,13 @@ + AC_SUBST(KARCH) + OVS_CHECK_LINUX + ++if test "$TARGET_PERL"; then ++ TARGET_PERL=$TARGET_PERL ++else ++ TARGET_PERL=$PERL ++fi ++AC_SUBST(TARGET_PERL) ++ + if test "$TARGET_PYTHON"; then + TARGET_PYTHON=$TARGET_PYTHON + else |
