[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-85-g8dcdce3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-85-g8dcdce3
|
From: Sébastien S. <ss...@us...> - 2016-05-24 14:35:35
|
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, buildroot-update has been updated
via 8dcdce3c8b8fdd75be11e10461ed28b0a8aaadc7 (commit)
from ba0629b347b5347af2d459d55bfd66f2367f488a (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 8dcdce3c8b8fdd75be11e10461ed28b0a8aaadc7
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 24 13:56:04 2016 +0200
[BUILDROOT] linux-headers-2.6.29.6: backport patch to fix uclibc compilation
-----------------------------------------------------------------------
Summary of changes:
.../224-linux-headers-fix-uclibc-compilation.patch | 90 ++++++++++++++++++++
patches/buildroot/2016.05/cleanup_buildroot.sh | 3 +-
2 files changed, 91 insertions(+), 2 deletions(-)
create mode 100644 patches/buildroot/2016.05/224-linux-headers-fix-uclibc-compilation.patch
diff --git a/patches/buildroot/2016.05/224-linux-headers-fix-uclibc-compilation.patch b/patches/buildroot/2016.05/224-linux-headers-fix-uclibc-compilation.patch
new file mode 100644
index 0000000..83037b5
--- /dev/null
+++ b/patches/buildroot/2016.05/224-linux-headers-fix-uclibc-compilation.patch
@@ -0,0 +1,90 @@
+Fix uclibc compilation with old linux-headers
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+Index: buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
+@@ -0,0 +1,82 @@
++From 9c501935a3cdcf6b1d35aaee3aa11c7a7051a305 Mon Sep 17 00:00:00 2001
++From: Ben Hutchings <be...@de...>
++Date: Mon, 5 Oct 2009 00:24:36 -0700
++Subject: [PATCH] net: Support inclusion of <linux/socket.h> before
++ <sys/socket.h>
++
++The following user-space program fails to compile:
++
++ #include <linux/socket.h>
++ #include <sys/socket.h>
++ int main() { return 0; }
++
++The reason is that <linux/socket.h> tests __GLIBC__ to decide whether it
++should define various structures and macros that are now defined for
++user-space by <sys/socket.h>, but __GLIBC__ is not defined if no libc
++headers have yet been included.
++
++It seems safe to drop support for libc 5 now.
++
++Signed-off-by: Ben Hutchings <be...@de...>
++Signed-off-by: Bastian Blank <wa...@de...>
++Signed-off-by: David S. Miller <da...@da...>
++---
++ include/linux/socket.h | 21 +++------------------
++ 1 file changed, 3 insertions(+), 18 deletions(-)
++
++diff --git a/include/linux/socket.h b/include/linux/socket.h
++index 3b461df..3273a0c 100644
++--- a/include/linux/socket.h
+++++ b/include/linux/socket.h
++@@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage {
++ /* _SS_MAXSIZE value minus size of ss_family */
++ } __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
++
++-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+++#ifdef __KERNEL__
++
++ #include <asm/socket.h> /* arch-dependent defines */
++ #include <linux/sockios.h> /* the SIOCxxx I/O controls */
++@@ -101,21 +101,6 @@ struct cmsghdr {
++ ((char *)(cmsg) - (char *)(mhdr)->msg_control)))
++
++ /*
++- * This mess will go away with glibc
++- */
++-
++-#ifdef __KERNEL__
++-#define __KINLINE static inline
++-#elif defined(__GNUC__)
++-#define __KINLINE static __inline__
++-#elif defined(__cplusplus)
++-#define __KINLINE static inline
++-#else
++-#define __KINLINE static
++-#endif
++-
++-
++-/*
++ * Get the next cmsg header
++ *
++ * PLEASE, do not touch this function. If you think, that it is
++@@ -128,7 +113,7 @@ struct cmsghdr {
++ * ancillary object DATA. --ANK (980731)
++ */
++
++-__KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size,
+++static inline struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size,
++ struct cmsghdr *__cmsg)
++ {
++ struct cmsghdr * __ptr;
++@@ -140,7 +125,7 @@ __KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size,
++ return __ptr;
++ }
++
++-__KINLINE struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr *__cmsg)
+++static inline struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr *__cmsg)
++ {
++ return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg);
++ }
++--
++2.3.6
++
diff --git a/patches/buildroot/2016.05/cleanup_buildroot.sh b/patches/buildroot/2016.05/cleanup_buildroot.sh
index fbd8270..db78670 100755
--- a/patches/buildroot/2016.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2016.05/cleanup_buildroot.sh
@@ -55,6 +55,7 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
+rm -rf buildroot/package/linux-headers/2.6.29.6/0001-net-Support-inclusion-of-linux-socket.h-before-sys-s.patch
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/ltrace/Config.in
@@ -111,8 +112,6 @@ rm -rf buildroot/package/tk/Config.in
rm -rf buildroot/package/tk/tk.mk
rm -rf buildroot/package/uboot-tools/2013.01/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
rm -rf buildroot/package/uboot-tools/uboot-tools-2013.10-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
-rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
-rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
hooks/post-receive
--
armadeus
|