]> code.ossystems Code Review - meta-freescale.git/commitdiff
linux-libc-headers-imx (2.6.35.3): Update version to use for headers
authorOtavio Salvador <otavio@ossystems.com.br>
Mon, 8 Oct 2012 06:00:45 +0000 (03:00 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Mon, 15 Oct 2012 14:52:49 +0000 (11:52 -0300)
This updates the recipe to use a more recent version for headers and
drop merged patch.

Change-Id: I6a67fabdcaf6ec11c5c7cc038b61be842962df64
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx-2.6.35.3/wire-up-sys_accept4-on-ARM.patch [deleted file]
meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb

diff --git a/meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx-2.6.35.3/wire-up-sys_accept4-on-ARM.patch b/meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx-2.6.35.3/wire-up-sys_accept4-on-ARM.patch
deleted file mode 100644 (file)
index 7182e80..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1415ec63689ef39bcb24b5095941ec4cc884035c Mon Sep 17 00:00:00 2001
-From: Mikael Pettersson <mikpe@it.uu.se>
-Date: Sun, 15 Aug 2010 10:47:23 +0100
-Subject: [PATCH 1/2] ARM: 6329/1: wire up sys_accept4() on ARM
-
-sys_accept4() was added in kernel 2.6.28, but ARM was not updated
-to include it.  The number and types of parameters is such that
-no ARM-specific processing is needed, so wiring up sys_accept4()
-just requires defining __NR_accept4 and adding a direct call in
-the syscall entry table.
-
-Tested with an EABI 2.6.35 kernel and Ulrich Drepper's original
-accept4() test program, modified to define __NR_accept4 for ARM.
-
-Using the updated unistd.h also eliminates a warning then building
-glibc (2.10.2 and newer) about accept4() being unimplemented.
-
-Upstream-Status: Backport [2.6.36]
-
-Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- arch/arm/include/asm/unistd.h |    1 +
- arch/arm/kernel/calls.S       |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
-index dd2bf53..d02cfb6 100644
---- a/arch/arm/include/asm/unistd.h
-+++ b/arch/arm/include/asm/unistd.h
-@@ -392,6 +392,7 @@
- #define __NR_rt_tgsigqueueinfo                (__NR_SYSCALL_BASE+363)
- #define __NR_perf_event_open          (__NR_SYSCALL_BASE+364)
- #define __NR_recvmmsg                 (__NR_SYSCALL_BASE+365)
-+#define __NR_accept4                  (__NR_SYSCALL_BASE+366)
- /*
-  * The following SWIs are ARM private.
-diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
-index 37ae301..afeb71f 100644
---- a/arch/arm/kernel/calls.S
-+++ b/arch/arm/kernel/calls.S
-@@ -375,6 +375,7 @@
-               CALL(sys_rt_tgsigqueueinfo)
-               CALL(sys_perf_event_open)
- /* 365 */     CALL(sys_recvmmsg)
-+              CALL(sys_accept4)
- #ifndef syscalls_counted
- .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
- #define syscalls_counted
--- 
-1.6.6.1
-
index f2274e3cf342f19b4f3e2f0e02c21e846ccc7e05..154c4c33220f4bcc84ab6515f59eb32db8f33593 100644 (file)
@@ -4,8 +4,9 @@ PROVIDES = "linux-libc-headers"
 RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
 RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
 
-SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;tag=rel_imx_2.6.35_11.09.01 \
-           file://wire-up-sys_accept4-on-ARM.patch"
+SRCREV = "012a4b8a404f5c89c31e2d428d5e4c9eb3a70ec7"
+SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git"
+
 S = "${WORKDIR}/git"
 
-PR = "r3"
+PR = "r4"