MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-05 13:25:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: Fix build with musl libc

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Khem Raj 2017-03-20 20:59:43 -07:00 committed by Bruce Ashfield
parent da1272171f
commit 1b83c21436
3 changed files with 80 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch Normal file
View File

@ -0,0 +1,35 @@
From 1cec65e45f011c3f52eed5e27d3d816502e36610 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 20 Mar 2017 12:12:51 -0700
Subject: [PATCH 1/2] use the linux if_packet.h Interface directly
Helps compiling with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/netdev-linux.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index a5a9ec1ab..9dd40acdd 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -33,14 +33,13 @@
#include <linux/pkt_sched.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
+#include <linux/if_packet.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/utsname.h>
-#include <netpacket/packet.h>
#include <net/if.h>
#include <net/if_arp.h>
-#include <net/if_packet.h>
#include <net/route.h>
#include <netinet/in.h>
#include <poll.h>
--
2.12.0

31
recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch Normal file
View File

@ -0,0 +1,31 @@
From 803bde12d32d16eefeae03422a0ac682e0601c43 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 20 Mar 2017 12:13:30 -0700
Subject: [PATCH 2/2] Define WAIT_ANY if not provided by system
POSIX does not define it and uses -1 directly
some libc do not have this definitions
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests/test-ovn.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/test-ovn.c b/tests/test-ovn.c
index 2e82a6f0d..76e7db9fb 100644
--- a/tests/test-ovn.c
+++ b/tests/test-ovn.c
@@ -37,6 +37,10 @@
#include "simap.h"
#include "util.h"
+#ifndef WAIT_ANY
+# define WAIT_ANY (-1) /* Any process. */
+#endif
+
/* --relops: Bitmap of the relational operators to test, in exhaustive test. */
static unsigned int test_relops;
--
2.12.0

23
recipes-networking/openvswitch/openvswitch_git.bb
View File

@ -17,15 +17,20 @@ PV = "2.6.1+${SRCREV}"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
SRCREV = "f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3"
SRC_URI += "\
git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.6 \
file://openvswitch-add-ptest-${SRCREV}.patch \
file://run-ptest \
file://disable_m4_check.patch \
file://kernel_module.patch \
file://openvswitch-ptest-Fix-python-path.patch \
file://python-make-remaining-scripts-use-usr-bin-env.patch \
"
SRC_URI = "file://openvswitch-switch \
file://openvswitch-switch-setup \
file://openvswitch-testcontroller \
file://openvswitch-testcontroller-setup \
git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.6 \
file://openvswitch-add-ptest-${SRCREV}.patch \
file://run-ptest \
file://disable_m4_check.patch \
file://kernel_module.patch \
file://openvswitch-ptest-Fix-python-path.patch \
file://python-make-remaining-scripts-use-usr-bin-env.patch \
file://0001-use-the-linux-if_packet.h-Interface-directly.patch \
file://0002-Define-WAIT_ANY-if-not-provided-by-system.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=17b2c9d4c70853a09c0e143137754b35"