From 9a1f303ea24075d8d2f2388452cec965591d5e57 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 21 Mar 2013 12:36:13 +0000 Subject: package/bridge-utils: fix build with newer kernels ... while keeping compatibility with older ones. Preventive fix to autobuild failures! ;-) Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- .../bridge-utils-000-build-system.patch | 11 ++++++++ ...dge-utils-001-fix-for-kernel-headers-3.8+.patch | 30 ++++++++++++++++++++++ package/bridge-utils/bridge-utils.patch | 11 -------- 3 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 package/bridge-utils/bridge-utils-000-build-system.patch create mode 100644 package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch delete mode 100644 package/bridge-utils/bridge-utils.patch (limited to 'package/bridge-utils') diff --git a/package/bridge-utils/bridge-utils-000-build-system.patch b/package/bridge-utils/bridge-utils-000-build-system.patch new file mode 100644 index 000000000..f44737750 --- /dev/null +++ b/package/bridge-utils/bridge-utils-000-build-system.patch @@ -0,0 +1,11 @@ +--- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600 ++++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600 +@@ -5,7 +5,7 @@ + RANLIB=@RANLIB@ + + CC=@CC@ +-CFLAGS = -Wall -g $(KERNEL_HEADERS) ++CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) + + prefix=@prefix@ + exec_prefix=@exec_prefix@ diff --git a/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch b/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch new file mode 100644 index 000000000..0455a9085 --- /dev/null +++ b/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch @@ -0,0 +1,30 @@ +commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d +Author: Russell Senior +Date: Wed Mar 6 12:49:42 2013 -0800 + + bridge-utils: Fix compile against linux-3.8.x + + Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a + struct in6_addr but doesn't define it. The trivial seeming fix of + including the header that does define it causes more problems. The + problem was discussed on mailing lists in January 2013. The final + suggestion I found was here: + + http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html + + This is intended to implement that suggestion. + + Signed-off-by: Russell Senior + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 39964f2..dd14bae 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -20,6 +20,7 @@ + #define _LIBBRIDGE_H + + #include ++#include + #include + #include + diff --git a/package/bridge-utils/bridge-utils.patch b/package/bridge-utils/bridge-utils.patch deleted file mode 100644 index f44737750..000000000 --- a/package/bridge-utils/bridge-utils.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600 -+++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600 -@@ -5,7 +5,7 @@ - RANLIB=@RANLIB@ - - CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) - - prefix=@prefix@ - exec_prefix=@exec_prefix@ -- cgit v1.2.3