openvswitch: uprev to v2.1.2

Updating to the latest OVS 2.x. Only minor patch refreshes required, and
no regressions were found during sanity testing.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 57 insertions, 69 deletions

diff --git a/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch b/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch
index aebb1823..cb708dea 100644
--- a/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch
+++ b/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch
@@ -2,19 +2,20 @@ Add test-install rule to support ptest execution
 
 Signed-off-by: Radu Patriu <radu.patriu@enea.com>
 
-Index: ovs/Makefile.am
+Index: openvswitch-2.1.2/Makefile.am
 ===================================================================
---- ovs.orig/Makefile.am        2014-03-10 16:19:46.000000000 +0200
-+++ ovs/Makefile.am     2014-03-10 16:23:10.481075341 +0200
-@@ -276,3 +276,4 @@
- include python/automake.mk
+--- openvswitch-2.1.2.orig/Makefile.am
++++ openvswitch-2.1.2/Makefile.am
+@@ -300,3 +300,5 @@
  include python/compat/automake.mk
  include tutorial/automake.mk
+ include vtep/automake.mk
 +include test.mk
-Index: ovs/test.mk
++
+Index: openvswitch-2.1.2/test.mk
 ===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ ovs/test.mk 2014-03-10 16:42:41.000000000 +0200
+--- /dev/null
++++ openvswitch-2.1.2/test.mk
 @@ -0,0 +1,49 @@
 +TEST_DEST ?= ${prefix}/lib/openvswitch
 +TEST_ROOT ?= ${prefix}/lib/openvswitch
diff --git a/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch b/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch
index 59607dad..97b352cb 100644
--- a/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch
+++ b/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch
@@ -24,11 +24,11 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
  utilities/ovs-vlan-test.in         | 2 +-
  11 files changed, 17 insertions(+), 9 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index b71ca1f..c4f8341 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -112,6 +112,7 @@ SUFFIXES += .in
+Index: openvswitch-2.1.2/Makefile.am
+===================================================================
+--- openvswitch-2.1.2.orig/Makefile.am
++++ openvswitch-2.1.2/Makefile.am
+@@ -125,6 +125,7 @@
                  -e 's,[@]DBDIR[@],$(DBDIR),g' \
                  -e 's,[@]PERL[@],$(PERL),g' \
                  -e 's,[@]PYTHON[@],$(PYTHON),g' \
@@ -36,11 +36,11 @@ index b71ca1f..c4f8341 100644
                  -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
                  -e 's,[@]VERSION[@],$(VERSION),g' \
                  -e 's,[@]localstatedir[@],$(localstatedir),g' \
-diff --git a/configure.ac b/configure.ac
-index 060b53f..74cb691 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,6 +101,13 @@ AC_ARG_VAR(KARCH, [Kernel Architecture String])
+Index: openvswitch-2.1.2/configure.ac
+===================================================================
+--- openvswitch-2.1.2.orig/configure.ac
++++ openvswitch-2.1.2/configure.ac
+@@ -118,6 +118,13 @@
  AC_SUBST(KARCH)
  OVS_CHECK_LINUX
  
@@ -51,99 +51,86 @@ index 060b53f..74cb691 100644
 +fi
 +AC_SUBST(TARGET_PYTHON)
 +
- AC_CONFIG_FILES([Makefile 
- datapath/Makefile 
- datapath/linux/Kbuild
-diff --git a/ovsdb/ovsdbmonitor/ovsdbmonitor.in b/ovsdb/ovsdbmonitor/ovsdbmonitor.in
-index e26130a..aaf1aff 100755
---- a/ovsdb/ovsdbmonitor/ovsdbmonitor.in
-+++ b/ovsdb/ovsdbmonitor/ovsdbmonitor.in
-@@ -1,4 +1,4 @@
--#! @PYTHON@
-+#! @TARGET_PYTHON@
- # Copyright (c) 2010 Citrix Systems, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
-diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
-index 2074e23..525939e 100755
---- a/utilities/bugtool/ovs-bugtool.in
-+++ b/utilities/bugtool/ovs-bugtool.in
+ AC_CONFIG_FILES(Makefile)
+ AC_CONFIG_FILES(datapath/Makefile)
+ AC_CONFIG_FILES(datapath/linux/Kbuild)
+Index: openvswitch-2.1.2/utilities/bugtool/ovs-bugtool.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/bugtool/ovs-bugtool.in
++++ openvswitch-2.1.2/utilities/bugtool/ovs-bugtool.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff --git a/utilities/ovs-check-dead-ifs.in b/utilities/ovs-check-dead-ifs.in
-index 9b806ed..b6f6fcb 100755
---- a/utilities/ovs-check-dead-ifs.in
-+++ b/utilities/ovs-check-dead-ifs.in
+Index: openvswitch-2.1.2/utilities/ovs-check-dead-ifs.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-check-dead-ifs.in
++++ openvswitch-2.1.2/utilities/ovs-check-dead-ifs.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  
  import os
  import re
-diff --git a/utilities/ovs-l3ping.in b/utilities/ovs-l3ping.in
-index 1b07972..4fedb6f 100644
---- a/utilities/ovs-l3ping.in
-+++ b/utilities/ovs-l3ping.in
+Index: openvswitch-2.1.2/utilities/ovs-l3ping.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-l3ping.in
++++ openvswitch-2.1.2/utilities/ovs-l3ping.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
-diff --git a/utilities/ovs-parse-backtrace.in b/utilities/ovs-parse-backtrace.in
-index 4f793be..4a07f47 100755
---- a/utilities/ovs-parse-backtrace.in
-+++ b/utilities/ovs-parse-backtrace.in
+Index: openvswitch-2.1.2/utilities/ovs-parse-backtrace.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-parse-backtrace.in
++++ openvswitch-2.1.2/utilities/ovs-parse-backtrace.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  #
  # Copyright (c) 2012 Nicira, Inc.
  #
-diff --git a/utilities/ovs-pcap.in b/utilities/ovs-pcap.in
-index 5306480..3221c7c 100755
---- a/utilities/ovs-pcap.in
-+++ b/utilities/ovs-pcap.in
+Index: openvswitch-2.1.2/utilities/ovs-pcap.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-pcap.in
++++ openvswitch-2.1.2/utilities/ovs-pcap.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  #
  # Copyright (c) 2010 Nicira, Inc.
  #
-diff --git a/utilities/ovs-tcpundump.in b/utilities/ovs-tcpundump.in
-index 0268c50..dad0bb5 100755
---- a/utilities/ovs-tcpundump.in
-+++ b/utilities/ovs-tcpundump.in
+Index: openvswitch-2.1.2/utilities/ovs-tcpundump.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-tcpundump.in
++++ openvswitch-2.1.2/utilities/ovs-tcpundump.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  #
  # Copyright (c) 2010 Nicira, Inc.
  #
-diff --git a/utilities/ovs-test.in b/utilities/ovs-test.in
-index fb1f9ad..bddd327 100644
---- a/utilities/ovs-test.in
-+++ b/utilities/ovs-test.in
+Index: openvswitch-2.1.2/utilities/ovs-test.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-test.in
++++ openvswitch-2.1.2/utilities/ovs-test.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
-diff --git a/utilities/ovs-vlan-test.in b/utilities/ovs-vlan-test.in
-index e229498..da64040 100755
---- a/utilities/ovs-vlan-test.in
-+++ b/utilities/ovs-vlan-test.in
+Index: openvswitch-2.1.2/utilities/ovs-vlan-test.in
+===================================================================
+--- openvswitch-2.1.2.orig/utilities/ovs-vlan-test.in
++++ openvswitch-2.1.2/utilities/ovs-vlan-test.in
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @TARGET_PYTHON@
  #
  # Copyright (c) 2010 Nicira, Inc.
  #
--- 
-1.8.1.2
-
diff --git a/recipes-networking/openvswitch/openvswitch_2.0.0.bb b/recipes-networking/openvswitch/openvswitch_2.1.2.bb
index 01003082..3f092afb 100644
--- a/recipes-networking/openvswitch/openvswitch_2.0.0.bb
+++ b/recipes-networking/openvswitch/openvswitch_2.1.2.bb
@@ -35,10 +35,10 @@ SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \
         file://run-ptest \
         "
 
-SRC_URI[md5sum] = "7d7a58350e634e515e0fe43c64d64f44"
-SRC_URI[sha256sum] = "5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8"
+SRC_URI[md5sum] = "430ff6d1e1fc81e9c5ebc2e641cfc953"
+SRC_URI[sha256sum] = "875429b052c4001815b6cb38616c7a6cb212df4bba74602164ee0a99b172079b"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=49eeb5acb1f5e510f12c44f176c42253"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e03b0d9c4115c44518594e5618e653f8"
 
 # Don't compile kernel modules by default since it heavily depends on
 # kernel version. Use the in-kernel module for now.