summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux-libc-headers
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-11-08 12:11:36 -0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:25 -0800
commit5958098e4f6afc323dda591ecbf7b5a0dc6b68e0 (patch)
treef68b0bebdbb7096bf7c84ae931ff29728b55a4f9 /meta/recipes-kernel/linux-libc-headers
parent563953df47785bf57969d86b9b5f8494e585a28c (diff)
downloadpoky-5958098e4f6afc323dda591ecbf7b5a0dc6b68e0.tar.gz
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>
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch46
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch25
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.36.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb)6
3 files changed, 2 insertions, 75 deletions
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
index 664995e9ef..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1# 2.6.33 deleted the Hayes esp driver, so the ioctls to get and set its
2# configuration are no longer needed, and they break setserial by making it
3# believe that it should compile in the code that supports this modem.
4
52010/06/16
6Created-by: Jeff Dike <jdike@linux.intel.com>
7
8# remove additional IOCTL defines that were in arch specific headers
9
102010/09/02
11Created-by: Saul Wold <saul.wold@intel.com>
12
13Index: linux-2.6.34/include/asm-generic/ioctls.h
14===================================================================
15--- linux-2.6.34.orig/include/asm-generic/ioctls.h
16+++ linux-2.6.34/include/asm-generic/ioctls.h
17@@ -86,16 +86,6 @@
18 #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
19 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
20
21-/*
22- * some architectures define FIOQSIZE as 0x545E, which is used for
23- * TIOCGHAYESESP on others
24- */
25-#ifndef FIOQSIZE
26-# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
27-# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
28-# define FIOQSIZE 0x5460
29-#endif
30-
31 /* Used for packet mode */
32 #define TIOCPKT_DATA 0
33 #define TIOCPKT_FLUSHREAD 1
34
35Index: linux-2.6.34/include/asm-generic/ioctls.h
36===================================================================
37--- linux-2.6.34/arch/mips/include/asm/ioctls.h 2010-05-16 14:17:36.000000000 -0700
38+++ linux-2.6.34_fixed/arch/mips/include/asm/ioctls.h 2010-09-02 14:54:14.641763250 -0700
39@@ -103,7 +103,5 @@
40 #define TIOCSERSETMULTI 0x5490 /* Set multiport config */
41 #define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */
42 #define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */
43-#define TIOCGHAYESESP 0x5493 /* Get Hayes ESP configuration */
44-#define TIOCSHAYESESP 0x5494 /* Set Hayes ESP configuration */
45
46 #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
index 81fa5ce8c9..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1stdint.h has C definitions which troubles assembler. and if asm/ptrace.h
2is included in assembler context, then it should not include the
3C-specific stdint.h file.
4 This was causing glibc building issue on ppc.
5Looks like this issue is introduced on the 2.6.34 kernel.
6
72010-06-024
8Signed-Off-By:Nitin A Kamble <nitin.a.kamble@intel.com>
9Acked-By:Jeff Dike <jdike@linux.intel.com>
10
11Index: linux-2.6.34/arch/powerpc/include/asm/ptrace.h
12===================================================================
13--- linux-2.6.34.orig/arch/powerpc/include/asm/ptrace.h
14+++ linux-2.6.34/arch/powerpc/include/asm/ptrace.h
15@@ -27,8 +27,10 @@
16 #ifdef __KERNEL__
17 #include <linux/types.h>
18 #else
19+#ifndef __ASSEMBLY__
20 #include <stdint.h>
21 #endif
22+#endif
23
24 #ifndef __ASSEMBLY__
25
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
index 685b70a4a8..dc9d49a073 100644
--- 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
2 2
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native" 4DEPENDS += "unifdef-native"
5PR = "r1" 5PR = "r0"
6 6
7SRC_URI += "file://hayes-gone.patch \ 7SRC_URI += " file://connector-msg-size-fix.patch"
8 file://ppc_glibc_build_fix.patch \
9 file://connector-msg-size-fix.patch"
10 8
11S = "${WORKDIR}/linux-${PV}" 9S = "${WORKDIR}/linux-${PV}"
12 10