Package openvswitch git

This revision corresponds to git rev 1667bb34988358aaf1c92d0d21fad4b1c8698780
(based on 2.3.90)

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

4 files changed, 125 insertions, 0 deletions

diff --git a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
new file mode 100644
index 00000000..1ad5d6f4
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
@@ -0,0 +1,18 @@
+Disable m4 file test where sources are built from git.
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -185,7 +185,7 @@
+ # Makefile in datapath/linux, needed to get the list of files to
+ # distribute, requires GNU make extensions.
+ if GNU_MAKE
+-ALL_LOCAL += dist-hook-git
++# ALL_LOCAL += dist-hook-git
+ dist-hook-git: distfiles
+        @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
+          (cd datapath && $(MAKE) distfiles);                               \
diff --git a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch b/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
new file mode 100644
index 00000000..033cfb8a
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
@@ -0,0 +1,20 @@
+Specify install path for kernel module
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+---
+ datapath/linux/Makefile.main.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/datapath/linux/Makefile.main.in
++++ b/datapath/linux/Makefile.main.in
+@@ -71,8 +71,8 @@
+        $(MAKE) -C $(KSRC) M=$(builddir) modules
+ 
+ modules_install:
+-       $(MAKE) -C $(KSRC) M=$(builddir) modules_install
+-       depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h`
++       $(MAKE) -C $(KSRC) M=$(builddir) modules_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH}
++       # depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h`
+ endif
+ 
+ # Much of the kernel build system in this file is derived from Intel's
diff --git a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
new file mode 100644
index 00000000..999f2ea7
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
@@ -0,0 +1,18 @@
+Remove __DATE__, __TIME__ - error messages on non-reproducible builds
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+---
+ datapath/datapath.c             |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/datapath/datapath.c
++++ b/datapath/datapath.c
+@@ -2142,7 +2142,7 @@
+ 
+        BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
+ 
+-       pr_info("Open vSwitch switching datapath %s, built "__DATE__" "__TIME__"\n",
++       pr_info("Open vSwitch switching datapath %s\n",
+                VERSION);
+ 
+        err = action_fifos_init();
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
new file mode 100644
index 00000000..76e312ca
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
@@ -0,0 +1,69 @@
+Add test-install rule to support ptest execution
+
+Signed-off-by: Radu Patriu <radu.patriu@enea.com>
+
+---
+ Makefile.am |    2 ++
+ test.mk     |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -369,3 +369,5 @@
+ include vtep/automake.mk
+ include datapath-windows/automake.mk
+ include datapath-windows/include/automake.mk
++include test.mk
++
+--- /dev/null
++++ b/test.mk
+@@ -0,0 +1,49 @@
++TEST_DEST ?= ${prefix}/lib/openvswitch
++TEST_ROOT ?= ${prefix}/lib/openvswitch
++TEST_DEPEND =
++
++if HAVE_OPENSSL
++TEST_DEPEND += $(TESTPKI_FILES)
++endif
++
++test-install: $(TEST_DEPEND)
++       @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\
++       install -d $(TEST_DEST)/tests ;\
++       install -d $(TEST_DEST)/python ;\
++       install -d $(TEST_DEST)/python/ovs ;\
++       install -d $(TEST_DEST)/python/ovs/db ;\
++       install -d $(TEST_DEST)/python/ovs/unixctl ;\
++       install -d $(TEST_DEST)/vswitchd ;\
++       install vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\
++       install -d $(TEST_DEST)/debian ;\
++       install debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\
++       install -d $(TEST_DEST)/build-aux ;\
++       install build-aux/check-structs $(TEST_DEST)/build-aux ;\
++       install -d $(TEST_DEST)/xenserver ;\
++       install xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\
++       install xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\
++       install xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\
++       install xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\
++       install xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\
++       install -d $(TEST_DEST)/vtep ;\
++       install vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\
++       for p in $$list ; do \
++         echo $$p ;\
++         p=$${p#./} ;\
++         pre=$${p#tests\/} ;\
++         if test $$pre != $$p ; then \
++           echo installing $$p to $(TEST_DEST)/tests/$$pre ;\
++           install $$p $(TEST_DEST)/tests/$$pre ;\
++           continue ;\
++         fi ;\
++         pre=$${p#python\/ovs\/} ;\
++         if test $$pre != $$p ; then \
++           echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\
++           install $$p $(TEST_DEST)/python/ovs/$$pre ;\
++           continue ;\
++         fi; \
++       done ;\
++       sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
++       sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
++       sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig
++       sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig