From patchwork Sun Mar 24 08:26:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 230381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 2AD262C00BE for ; Sun, 24 Mar 2013 19:27:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 96C1A102452; Sun, 24 Mar 2013 08:26:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X3ErEm6+LbgS; Sun, 24 Mar 2013 08:26:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 26876101C3A; Sun, 24 Mar 2013 08:26:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 65C838F7A4 for ; Sun, 24 Mar 2013 08:27:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C808A8BE80 for ; Sun, 24 Mar 2013 08:26:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6TOjLoiZqbqV for ; Sun, 24 Mar 2013 08:26:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by whitealder.osuosl.org (Postfix) with ESMTP id 2C43C8BF5C for ; Sun, 24 Mar 2013 08:26:54 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id CA128864; Sun, 24 Mar 2013 09:26:52 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 91AFA73F; Sun, 24 Mar 2013 09:26:51 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 24 Mar 2013 09:26:25 +0100 Message-Id: <1364113606-20836-2-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364113606-20836-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1364113606-20836-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 01/22] package/connman: version bump to 1.12, and fix build with newer kernels headers X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" ... while keeping compatibility with older ones. Fixes autobuild failure: http://autobuild.buildroot.org/results/f99ae7af46c70f7c356b7771321511a42eb3694d/ Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/connman/connman-000-uclibc-backtrace.patch | 44 ++++++++++++++++++++ .../connman-001-fix-for-latest-headers-3.8+.patch | 19 +++++++++ package/connman/connman-uclibc-backtrace.patch | 44 -------------------- package/connman/connman.mk | 2 +- 4 files changed, 64 insertions(+), 45 deletions(-) create mode 100644 package/connman/connman-000-uclibc-backtrace.patch create mode 100644 package/connman/connman-001-fix-for-latest-headers-3.8+.patch delete mode 100644 package/connman/connman-uclibc-backtrace.patch diff --git a/package/connman/connman-000-uclibc-backtrace.patch b/package/connman/connman-000-uclibc-backtrace.patch new file mode 100644 index 0000000..4b806c6 --- /dev/null +++ b/package/connman/connman-000-uclibc-backtrace.patch @@ -0,0 +1,44 @@ +[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE + +Backtrace support is only used for logging on signal errors, which +isn't really critical, so simply remove backtrace info if not +available in uClibc. + +Signed-off-by: Peter Korsgaard +--- + src/log.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +Index: connman-0.78/src/log.c +=================================================================== +--- connman-0.78.orig/src/log.c ++++ connman-0.78/src/log.c +@@ -30,7 +30,12 @@ + #include + #include + #include ++#include ++/* backtrace support is optional on uClibc */ ++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) ++#define HAVE_BACKTRACE + #include ++#endif + #include + + #include "connman.h" +@@ -112,6 +117,7 @@ + + static void print_backtrace(unsigned int offset) + { ++#ifdef HAVE_BACKTRACE + void *frames[99]; + size_t n_ptrs; + unsigned int i; +@@ -210,6 +216,7 @@ + + close(outfd[1]); + close(infd[0]); ++#endif /* HAVE_BACKTRACE */ + } + + static void signal_handler(int signo) diff --git a/package/connman/connman-001-fix-for-latest-headers-3.8+.patch b/package/connman/connman-001-fix-for-latest-headers-3.8+.patch new file mode 100644 index 0000000..ef1fabc --- /dev/null +++ b/package/connman/connman-001-fix-for-latest-headers-3.8+.patch @@ -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" + +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 + #include + #include ++#include + #include + + #include "connman.h" diff --git a/package/connman/connman-uclibc-backtrace.patch b/package/connman/connman-uclibc-backtrace.patch deleted file mode 100644 index 4b806c6..0000000 --- a/package/connman/connman-uclibc-backtrace.patch +++ /dev/null @@ -1,44 +0,0 @@ -[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE - -Backtrace support is only used for logging on signal errors, which -isn't really critical, so simply remove backtrace info if not -available in uClibc. - -Signed-off-by: Peter Korsgaard ---- - src/log.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: connman-0.78/src/log.c -=================================================================== ---- connman-0.78.orig/src/log.c -+++ connman-0.78/src/log.c -@@ -30,7 +30,12 @@ - #include - #include - #include -+#include -+/* backtrace support is optional on uClibc */ -+#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) -+#define HAVE_BACKTRACE - #include -+#endif - #include - - #include "connman.h" -@@ -112,6 +117,7 @@ - - static void print_backtrace(unsigned int offset) - { -+#ifdef HAVE_BACKTRACE - void *frames[99]; - size_t n_ptrs; - unsigned int i; -@@ -210,6 +216,7 @@ - - close(outfd[1]); - close(infd[0]); -+#endif /* HAVE_BACKTRACE */ - } - - static void signal_handler(int signo) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index bb528b4..f29ff3b 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -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