bridge-utils: Upgrade to 1.5

Disable parallel make it does not work all the time
Fix build with kernel-headers from 3.8

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 33 insertions, 6 deletions

diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
new file mode 100644
index 000000000..de36f0598
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
@@ -0,0 +1,22 @@
+include missing kernel header
+
+Fixes errors like
+
+| /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type
+| In file included from ../libbridge/libbridge.h:24:0,
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: bridge-utils-1.5/libbridge/libbridge.h
+===================================================================
+--- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-28 17:52:54.000000000 -0700
++++ bridge-utils-1.5/libbridge/libbridge.h      2013-03-04 21:16:25.781188309 -0800
+@@ -20,6 +20,7 @@
+ #define _LIBBRIDGE_H
+ 
+ #include <sys/socket.h>
++#include <linux/in6.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
deleted file mode 100644
index 00a5815b0..000000000
--- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require bridge-utils.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
-
-SRC_URI[md5sum] = "0182fcac3a2b307113bbec34e5f1c673"
-SRC_URI[sha256sum] = "876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933"
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
new file mode 100644
index 000000000..04f863b22
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
@@ -0,0 +1,11 @@
+require bridge-utils.inc
+
+SRC_URI += "file://kernel-headers.patch"
+
+PARALLEL_MAKE = ""
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
+
+SRC_URI[md5sum] = "ec7b381160b340648dede58c31bb2238"
+SRC_URI[sha256sum] = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"
+