summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-06-21 04:56:52 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:28:54 +0100
commitf8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a (patch)
treea073a9119d2f4b7dca54564db65fe126c1dc671a
parent4d5ad73238d8811b29833fb500774a69f3d6810e (diff)
downloadpoky-f8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a.tar.gz
linux-libc-headers: upgrade from 2.6.33 to 2.6.34
added a new patch to fix glibc build issue on powerpc ppc_glibc_build_fix.patch Added attribution to the hayes-gone.patch. And updated the metadata variables like LICENSE & LIC_CHKSUM_FILES And removing all the older recipes and related files Change the linux-libc-header version inpoky-default.inc Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/conf/distro/include/poky-default.inc2
-rw-r--r--meta/packages/linux-libc-headers/files/unifdef.patch31
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h24
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch12
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers.inc5
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers/hayes-gone.patch (renamed from meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch)9
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch25
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb51
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.29.bb45
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb46
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.34.bb (renamed from meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb)10
11 files changed, 41 insertions, 219 deletions
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index cf6739d39d..90ec4ce399 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
15GCCVERSION ?= "4.3.3" 15GCCVERSION ?= "4.3.3"
16BINUVERSION ?= "2.20.1" 16BINUVERSION ?= "2.20.1"
17GLIBCVERSION ?= "2.9" 17GLIBCVERSION ?= "2.9"
18LINUXLIBCVERSION ?= "2.6.33" 18LINUXLIBCVERSION ?= "2.6.34"
19 19
20# Temporary preferred version overrides for PPC 20# Temporary preferred version overrides for PPC
21PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" 21PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
diff --git a/meta/packages/linux-libc-headers/files/unifdef.patch b/meta/packages/linux-libc-headers/files/unifdef.patch
deleted file mode 100644
index bda8860009..0000000000
--- a/meta/packages/linux-libc-headers/files/unifdef.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Index: linux-2.6.20/scripts/unifdef.c
2===================================================================
3--- linux-2.6.20.orig/scripts/unifdef.c
4+++ linux-2.6.20/scripts/unifdef.c
5@@ -206,7 +206,7 @@ static void done(void);
6 static void error(const char *);
7 static int findsym(const char *);
8 static void flushline(bool);
9-static Linetype getline(void);
10+static Linetype parseline(void);
11 static Linetype ifeval(const char **);
12 static void ignoreoff(void);
13 static void ignoreon(void);
14@@ -512,7 +512,7 @@ process(void)
15
16 for (;;) {
17 linenum++;
18- lineval = getline();
19+ lineval = parseline();
20 trans_table[ifstate[depth]][lineval]();
21 debug("process %s -> %s depth %d",
22 linetype_name[lineval],
23@@ -526,7 +526,7 @@ process(void)
24 * help from skipcomment().
25 */
26 static Linetype
27-getline(void)
28+parseline(void)
29 {
30 const char *cp;
31 int cursym;
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h
deleted file mode 100644
index 8cdf828af8..0000000000
--- a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h
+++ /dev/null
@@ -1,24 +0,0 @@
1/*
2 * linux/include/asm-arm/procinfo.h
3 *
4 * Copyright (C) 1996-1999 Russell King
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#ifndef __ASM_PROCINFO_H
11#define __ASM_PROCINFO_H
12
13#define HWCAP_SWP 1
14#define HWCAP_HALF 2
15#define HWCAP_THUMB 4
16#define HWCAP_26BIT 8 /* Play it safe */
17#define HWCAP_FAST_MULT 16
18#define HWCAP_FPA 32
19#define HWCAP_VFP 64
20#define HWCAP_EDSP 128
21#define HWCAP_JAVA 256
22#define HWCAP_IWMMXT 512
23#define HWCAP_CRUNCH 1024
24#endif
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch
deleted file mode 100644
index b2ebf40632..0000000000
--- a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: linux-2.6.30/include/linux/if_tunnel.h
2===================================================================
3--- linux-2.6.30.orig/include/linux/if_tunnel.h 2009-08-27 14:34:49.000000000 +0100
4+++ linux-2.6.30/include/linux/if_tunnel.h 2009-08-27 14:35:04.000000000 +0100
5@@ -2,6 +2,7 @@
6 #define _IF_TUNNEL_H_
7
8 #include <linux/types.h>
9+#include <asm/byteorder.h>
10
11 #ifdef __KERNEL__
12 #include <linux/ip.h>
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers.inc b/meta/packages/linux-libc-headers/linux-libc-headers.inc
index 1f567ca1d1..e6cb1d8669 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/packages/linux-libc-headers/linux-libc-headers.inc
@@ -1,6 +1,9 @@
1DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." 1DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
2SECTION = "devel" 2SECTION = "devel"
3LICENSE = "GPL" 3LICENSE = "GPLv2"
4
5LIC_CHKSUM_FILES = "file://COPYING "
6SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2"
4 7
5#DEPENDS = "cross-linkage" 8#DEPENDS = "cross-linkage"
6RDEPENDS_${PN}-dev = "" 9RDEPENDS_${PN}-dev = ""
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch b/meta/packages/linux-libc-headers/linux-libc-headers/hayes-gone.patch
index dc6338a952..719c320202 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.33/hayes-gone.patch
+++ b/meta/packages/linux-libc-headers/linux-libc-headers/hayes-gone.patch
@@ -2,10 +2,13 @@
2# configuration are no longer needed, and they break setserial by making it 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. 3# believe that it should compile in the code that supports this modem.
4 4
5Index: linux-2.6.33/include/asm-generic/ioctls.h 52010/06/16
6Created-by: Jeff Dike <jdike@linux.intel.com>
7
8Index: linux-2.6.34/include/asm-generic/ioctls.h
6=================================================================== 9===================================================================
7--- linux-2.6.33.orig/include/asm-generic/ioctls.h 10--- linux-2.6.34.orig/include/asm-generic/ioctls.h
8+++ linux-2.6.33/include/asm-generic/ioctls.h 11+++ linux-2.6.34/include/asm-generic/ioctls.h
9@@ -86,16 +86,6 @@ 12@@ -86,16 +86,6 @@
10 #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ 13 #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
11 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ 14 #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch b/meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
new file mode 100644
index 0000000000..81fa5ce8c9
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch
@@ -0,0 +1,25 @@
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/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
deleted file mode 100644
index e72d710c9c..0000000000
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ /dev/null
@@ -1,51 +0,0 @@
1require linux-libc-headers.inc
2
3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native"
5PR = "r10"
6
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
8 file://procinfo.h \
9 file://unifdef.patch;patch=1"
10
11S = "${WORKDIR}/linux-${PV}"
12
13set_arch() {
14 case ${TARGET_ARCH} in
15 alpha*) ARCH=alpha ;;
16 arm*) ARCH=arm ;;
17 cris*) ARCH=cris ;;
18 hppa*) ARCH=parisc ;;
19 i*86*) ARCH=i386 ;;
20 ia64*) ARCH=ia64 ;;
21 mips*) ARCH=mips ;;
22 m68k*) ARCH=m68k ;;
23 powerpc*) ARCH=powerpc ;;
24 s390*) ARCH=s390 ;;
25 sh*) ARCH=sh ;;
26 sparc64*) ARCH=sparc64 ;;
27 sparc*) ARCH=sparc ;;
28 x86_64*) ARCH=x86_64 ;;
29 avr32*) ARCH=avr32 ;;
30 bfin*) ARCH=blackfin ;;
31 esac
32}
33
34do_configure() {
35 set_arch
36 oe_runmake allnoconfig ARCH=$ARCH
37}
38
39do_compile () {
40}
41
42do_install() {
43 set_arch
44 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
45}
46
47do_install_append_arm() {
48 cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/
49}
50
51BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.29.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.29.bb
deleted file mode 100644
index 5b8e7a4fdf..0000000000
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.29.bb
+++ /dev/null
@@ -1,45 +0,0 @@
1require linux-libc-headers.inc
2
3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native"
5PR = "r2"
6
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 "
8
9S = "${WORKDIR}/linux-${PV}"
10
11set_arch() {
12 case ${TARGET_ARCH} in
13 alpha*) ARCH=alpha ;;
14 arm*) ARCH=arm ;;
15 cris*) ARCH=cris ;;
16 hppa*) ARCH=parisc ;;
17 i*86*) ARCH=i386 ;;
18 ia64*) ARCH=ia64 ;;
19 mips*) ARCH=mips ;;
20 m68k*) ARCH=m68k ;;
21 powerpc*) ARCH=powerpc ;;
22 s390*) ARCH=s390 ;;
23 sh*) ARCH=sh ;;
24 sparc64*) ARCH=sparc64 ;;
25 sparc*) ARCH=sparc ;;
26 x86_64*) ARCH=x86_64 ;;
27 avr32*) ARCH=avr32 ;;
28 bfin*) ARCH=blackfin ;;
29 esac
30}
31
32do_configure() {
33 set_arch
34 oe_runmake allnoconfig ARCH=$ARCH
35}
36
37do_compile () {
38}
39
40do_install() {
41 set_arch
42 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
43}
44
45BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb
deleted file mode 100644
index 9f7c484ee3..0000000000
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb
+++ /dev/null
@@ -1,46 +0,0 @@
1require linux-libc-headers.inc
2
3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native"
5PR = "r3"
6
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
8 file://headerfix.patch;patch=1"
9
10S = "${WORKDIR}/linux-${PV}"
11
12set_arch() {
13 case ${TARGET_ARCH} in
14 alpha*) ARCH=alpha ;;
15 arm*) ARCH=arm ;;
16 cris*) ARCH=cris ;;
17 hppa*) ARCH=parisc ;;
18 i*86*) ARCH=i386 ;;
19 ia64*) ARCH=ia64 ;;
20 mips*) ARCH=mips ;;
21 m68k*) ARCH=m68k ;;
22 powerpc*) ARCH=powerpc ;;
23 s390*) ARCH=s390 ;;
24 sh*) ARCH=sh ;;
25 sparc64*) ARCH=sparc64 ;;
26 sparc*) ARCH=sparc ;;
27 x86_64*) ARCH=x86_64 ;;
28 avr32*) ARCH=avr32 ;;
29 bfin*) ARCH=blackfin ;;
30 esac
31}
32
33do_configure() {
34 set_arch
35 oe_runmake allnoconfig ARCH=$ARCH
36}
37
38do_compile () {
39}
40
41do_install() {
42 set_arch
43 oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
44}
45
46BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.34.bb
index a299f55c29..31c305854f 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.34.bb
@@ -2,10 +2,10 @@ require linux-libc-headers.inc
2 2
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native" 4DEPENDS += "unifdef-native"
5PR = "r2" 5PR = "r0"
6 6
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ 7SRC_URI += "file://hayes-gone.patch \
8 file://hayes-gone.patch" 8 file://ppc_glibc_build_fix.patch"
9 9
10S = "${WORKDIR}/linux-${PV}" 10S = "${WORKDIR}/linux-${PV}"
11 11
@@ -25,8 +25,8 @@ set_arch() {
25 sparc64*) ARCH=sparc64 ;; 25 sparc64*) ARCH=sparc64 ;;
26 sparc*) ARCH=sparc ;; 26 sparc*) ARCH=sparc ;;
27 x86_64*) ARCH=x86_64 ;; 27 x86_64*) ARCH=x86_64 ;;
28 avr32*) ARCH=avr32 ;; 28 avr32*) ARCH=avr32 ;;
29 bfin*) ARCH=blackfin ;; 29 bfin*) ARCH=blackfin ;;
30 esac 30 esac
31} 31}
32 32