Skip to contentSkip to conversation

Pull request for branch yem-latest-headers-bridge

GIT PULL New Yann E. MORIN 2 participants 4 messages Mar 21, 2013 – Mar 24, 2013

lore
Share & tools
lore
#0 lore raw

Hello All!

This series fixes two breakages with toolchain using headers from Linux 3.8+, due to the headers shuffling done for the UAPI stuff.

The series fixes two packages:
- connman, already caught by the autobuilders
- bridge-utils, as0yet un-caught to my knowledge

There are other packages imopacted by this UAPI shuffling:
- iptables, already fixed in the version we use (yeah!)
- maybe other yet unidentified packages (not-so-yeah...)

The following changes since commit 1f721a2f009393c29c6554f643f15f80a8dc5443:

xinetd: follow the convention for patch location (2013-03-20 23:28:27 +0100)

are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem-latest-headers-bridge

Yann E. MORIN (2):
package/bridge-utils: fix build with newer kernels package/connman: version bump to 1.12, and fix build with newer kernels headers

 ...s.patch => bridge-utils-000-build-system.patch} |    0
 ...dge-utils-001-fix-for-kernel-headers-3.8+.patch |   30 ++++++++++++++++++++
 ...ce.patch => connman-000-uclibc-backtrace.patch} |    0
 .../connman-001-fix-for-latest-headers-3.8+.patch  |   19 ++++++++++++
 package/connman/connman.mk                         |    2 +-
 5 files changed, 50 insertions(+), 1 deletions(-)
 rename package/bridge-utils/{bridge-utils.patch => bridge-utils-000-build-system.patch} (100%)
 create mode 100644 package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
 rename package/connman/{connman-uclibc-backtrace.patch => connman-000-uclibc-backtrace.patch} (100%)
 create mode 100644 package/connman/connman-001-fix-for-latest-headers-3.8+.patch

Regards,
Yann E. MORIN

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 package/bridge-utils: fix build with newer kernels

... while keeping compatibility with older ones.

Preventive fix to autobuild failures! ;-)

---
 ...s.patch => bridge-utils-000-build-system.patch} |    0
 ...dge-utils-001-fix-for-kernel-headers-3.8+.patch |   30 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
 rename package/bridge-utils/{bridge-utils.patch => bridge-utils-000-build-system.patch} (100%)
 create mode 100644 package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
package/bridge-utils/bridge-utils-000-build-system.patch renamed from package/bridge-utils/bridge-utils.patch +0 -0
similarity index 100%
rename from package/bridge-utils/bridge-utils.patch
rename to package/bridge-utils/bridge-utils-000-build-system.patch
package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch new file +30 -0
new file mode 100644
index 0000000..0455a90
@@ -0,0 +1,30 @@
+commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
+Author: Russell Senior <[email protected]>
+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 <[email protected]>
+
+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 <sys/socket.h>
++#include <netinet/in.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH 1/2 package/bridge-utils: fix build with newer kernels

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> ... while keeping compatibility with older ones. Yann> Preventive fix to autobuild failures! ;-)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/connman: version bump to 1.12, and fix build with newer kernels headers

In reply to Yann E. MORIN

... while keeping compatibility with older ones.

Fixes autobuild failure:
http://autobuild.buildroot.org/results/f99ae7af46c70f7c356b7771321511a42eb3694d/

---
 ...ce.patch => connman-000-uclibc-backtrace.patch} |    0
 .../connman-001-fix-for-latest-headers-3.8+.patch  |   19 +++++++++++++++++++
 package/connman/connman.mk                         |    2 +-
 3 files changed, 20 insertions(+), 1 deletions(-)
 rename package/connman/{connman-uclibc-backtrace.patch => connman-000-uclibc-backtrace.patch} (100%)
 create mode 100644 package/connman/connman-001-fix-for-latest-headers-3.8+.patch
package/connman/connman-000-uclibc-backtrace.patch renamed from package/connman/connman-uclibc-backtrace.patch +0 -0
similarity index 100%
rename from package/connman/connman-uclibc-backtrace.patch
rename to package/connman/connman-000-uclibc-backtrace.patch
package/connman/connman-001-fix-for-latest-headers-3.8+.patch new file +19 -0
new file mode 100644
index 0000000..ef1fabc
@@ -0,0 +1,19 @@
+tethering: fix build with kernel headers 3.8+
+
+Highly inspired by:
+    package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
+    http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN connman-1.11.orig/src/tethering.c connman-1.11/src/tethering.c
+--- connman-1.11.orig/src/tethering.c	2012-12-22 22:52:47.000000000 +0100
++++ connman-1.11/src/tethering.c	2013-03-21 19:39:17.036029270 +0100
+@@ -35,6 +35,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <linux/if_tun.h>
++#include <netinet/in.h>
+ #include <linux/if_bridge.h>
+ 
+ #include "connman.h"
package/connman/connman.mk +1 -1
index bb528b4..f29ff3b 100644
@@ -4,7 +4,7 @@
 #
 #######################################################
 
-CONNMAN_VERSION = 1.11
+CONNMAN_VERSION = 1.12
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
 CONNMAN_INSTALL_STAGING = YES
Signature · 1 line
1.7.2.5