[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-193-g1430e6f

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  1430e6f0968c6b4fd31dbfc67a466e51a45162e1 (commit)
      from  528a49030d4209b73db1c2147c0b7247edf306af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1430e6f0968c6b4fd31dbfc67a466e51a45162e1
Author: Jeremie Scheer <jer...@ar...>
Date:   Fri Mar 23 17:10:39 2012 +0100

    [BUILDROOT][UCLIBC] Patch 182 for uClibc 0.9.33 to remove accept4 declaration if not available in Linux Kernel.
    [BUILDROOT][UCLIBC] Change patch 047 to make uClibc 0.9.33 the Buildroot's default version.

-----------------------------------------------------------------------

Summary of changes:
 patches/buildroot/2012.02/047-uclibc-config.patch  |   21 +++++++++-
 .../182-uclibc-add_accept4_declaration_fix.patch   |   42 ++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch

diff --git a/patches/buildroot/2012.02/047-uclibc-config.patch b/patches/buildroot/2012.02/047-uclibc-config.patch
index 2fcd115..d970155 100644
--- a/patches/buildroot/2012.02/047-uclibc-config.patch
+++ b/patches/buildroot/2012.02/047-uclibc-config.patch
@@ -1,7 +1,11 @@
+Make uClibc 0.9.33 as Buildroot's default version
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
 Index: buildroot/toolchain/uClibc/uclibc.mk
 ===================================================================
---- buildroot.orig/toolchain/uClibc/uclibc.mk	2012-02-21 16:43:28.000000000 +0100
-+++ buildroot/toolchain/uClibc/uclibc.mk	2012-02-21 16:44:22.000000000 +0100
+--- buildroot.orig/toolchain/uClibc/uclibc.mk	2012-02-29 23:19:47.000000000 +0100
++++ buildroot/toolchain/uClibc/uclibc.mk	2012-03-23 16:57:54.000000000 +0100
 @@ -102,23 +102,6 @@
  		-e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
  		$(UCLIBC_DIR)/.oldconfig
@@ -26,3 +30,16 @@ Index: buildroot/toolchain/uClibc/uclibc.mk
  	$(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
  		 $(UCLIBC_DIR)/.oldconfig
  	$(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
+Index: buildroot/toolchain/uClibc/Config.in
+===================================================================
+--- buildroot.orig/toolchain/uClibc/Config.in	2012-03-23 17:04:18.000000000 +0100
++++ buildroot/toolchain/uClibc/Config.in	2012-03-23 17:04:28.000000000 +0100
+@@ -6,7 +6,7 @@
+ choice
+ 	prompt "uClibc C library Version"
+ 	default BR2_UCLIBC_VERSION_0_9_31 if (BR2_avr32 || BR2_sh) # 0.9.32 broken
+-	default BR2_UCLIBC_VERSION_0_9_32
++	default BR2_UCLIBC_VERSION_0_9_33
+ 	help
+ 	  Select the version of uClibc you wish to use.
+ 
diff --git a/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
new file mode 100644
index 0000000..1f97a32
--- /dev/null
+++ b/patches/buildroot/2012.02/182-uclibc-add_accept4_declaration_fix.patch
@@ -0,0 +1,42 @@
+Fix accept4 declaration in uClibc when not available in Linux Kernel.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch	2012-03-23 16:45:27.000000000 +0100
+@@ -0,0 +1,33 @@
++From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:19 +0200
++Subject: [PATCH 1/2] Only expose accept4 in headers if it is available
++
++---
++ include/sys/socket.h |    3 ++-
++ 1 files changed, 2 insertions(+), 1 deletions(-)
++
++diff --git a/include/sys/socket.h b/include/sys/socket.h
++index 6037f92..53b56ea 100644
++--- a/include/sys/socket.h
+++++ b/include/sys/socket.h
++@@ -22,6 +22,7 @@
++ #define	_SYS_SOCKET_H	1
++
++ #include <features.h>
+++#include <bits/kernel-features.h>
++
++ __BEGIN_DECLS
++
++@@ -227,7 +228,7 @@ extern int accept (int __fd, __SOCKADDR_ARG __addr,
++ 		   socklen_t *__restrict __addr_len);
++ libc_hidden_proto(accept)
++
++-#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
+++#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU && defined __ASSUME_ACCEPT4
++ /* Similar to 'accept' but takes an additional parameter to specify flags.
++
++    This function is a cancellation point and therefore not marked with
++--
++1.7.4.1
++


hooks/post-receive
-- 
armadeus