linux-libc-headers: upgrade from 2.6.34 to 2.6.36

The upstream code has changed, and it does not need these fixes
anymore.

Removed these patches:
    hayes-gone.patch
    ppc_glibc_build_fix.patch

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
deleted file mode 100644 (file)
index 664995e..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# 2.6.33 deleted the Hayes esp driver, so the ioctls to get and set its
-# configuration are no longer needed, and they break setserial by making it
-# believe that it should compile in the code that supports this modem.
-
-2010/06/16
-Created-by: Jeff Dike <jdike@linux.intel.com>
-
-# remove additional IOCTL defines that were in arch specific headers
-
-2010/09/02
-Created-by: Saul Wold <saul.wold@intel.com>
-
-Index: linux-2.6.34/include/asm-generic/ioctls.h
-===================================================================
---- linux-2.6.34.orig/include/asm-generic/ioctls.h
-+++ linux-2.6.34/include/asm-generic/ioctls.h
-@@ -86,16 +86,6 @@
- #define TIOCMIWAIT    0x545C  /* wait for a change on serial input line(s) */
- #define TIOCGICOUNT   0x545D  /* read serial port inline interrupt counts */
- 
--/*
-- * some architectures define FIOQSIZE as 0x545E, which is used for
-- * TIOCGHAYESESP on others
-- */
--#ifndef FIOQSIZE
--# define TIOCGHAYESESP        0x545E  /* Get Hayes ESP configuration */
--# define TIOCSHAYESESP        0x545F  /* Set Hayes ESP configuration */
--# define FIOQSIZE     0x5460
--#endif
--
- /* Used for packet mode */
- #define TIOCPKT_DATA           0
- #define TIOCPKT_FLUSHREAD      1
-
-Index: linux-2.6.34/include/asm-generic/ioctls.h
-===================================================================
---- linux-2.6.34/arch/mips/include/asm/ioctls.h        2010-05-16 14:17:36.000000000 -0700
-+++ linux-2.6.34_fixed/arch/mips/include/asm/ioctls.h  2010-09-02 14:54:14.641763250 -0700
-@@ -103,7 +103,5 @@
- #define TIOCSERSETMULTI 0x5490 /* Set multiport config */
- #define TIOCMIWAIT      0x5491 /* wait for a change on serial input line(s) */
- #define TIOCGICOUNT     0x5492 /* read serial port inline interrupt counts */
--#define TIOCGHAYESESP 0x5493 /* Get Hayes ESP configuration */
--#define TIOCSHAYESESP 0x5494 /* Set Hayes ESP configuration */
- 
- #endif /* __ASM_IOCTLS_H */

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
deleted file mode 100644 (file)
index 81fa5ce..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-stdint.h has C definitions which troubles assembler. and if asm/ptrace.h 
-is included in assembler context, then it should not include the 
-C-specific stdint.h file.
-  This was causing glibc building issue on ppc.
-Looks like this issue is introduced on the 2.6.34 kernel.
-
-2010-06-024
-Signed-Off-By:Nitin A Kamble <nitin.a.kamble@intel.com>
-Acked-By:Jeff Dike <jdike@linux.intel.com>
-
-Index: linux-2.6.34/arch/powerpc/include/asm/ptrace.h
-===================================================================
---- linux-2.6.34.orig/arch/powerpc/include/asm/ptrace.h
-+++ linux-2.6.34/arch/powerpc/include/asm/ptrace.h
-@@ -27,8 +27,10 @@
- #ifdef __KERNEL__
- #include <linux/types.h>
- #else
-+#ifndef __ASSEMBLY__
- #include <stdint.h>
- #endif
-+#endif
- 
- #ifndef __ASSEMBLY__
- 

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.36.bb
similarity index 86%
rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.36.bb
index 685b70a..dc9d49a 100644 (file)
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.36.bb
@@ -2,11 +2,9 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r0"
 
-SRC_URI += "file://hayes-gone.patch \
-           file://ppc_glibc_build_fix.patch \
-           file://connector-msg-size-fix.patch"
+SRC_URI += " file://connector-msg-size-fix.patch"
 
 S = "${WORKDIR}/linux-${PV}"