diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-06-21 04:56:52 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:28:54 +0100 |
commit | f8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a (patch) | |
tree | a073a9119d2f4b7dca54564db65fe126c1dc671a /meta/packages | |
parent | 4d5ad73238d8811b29833fb500774a69f3d6810e (diff) | |
download | openembedded-core-f8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a.tar.gz openembedded-core-f8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a.tar.bz2 openembedded-core-f8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a.tar.xz openembedded-core-f8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a.zip |
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>
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/linux-libc-headers/files/unifdef.patch | 31 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h | 24 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch | 12 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers.inc | 5 | ||||
-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.patch | 25 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb | 51 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers_2.6.29.bb | 45 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb | 46 | ||||
-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 |
10 files changed, 40 insertions, 218 deletions
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 bda886000..000000000 --- a/meta/packages/linux-libc-headers/files/unifdef.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: linux-2.6.20/scripts/unifdef.c -=================================================================== ---- linux-2.6.20.orig/scripts/unifdef.c -+++ linux-2.6.20/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype parseline(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = parseline(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+parseline(void) - { - const char *cp; - 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 8cdf828af..000000000 --- a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.20/procinfo.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * linux/include/asm-arm/procinfo.h - * - * Copyright (C) 1996-1999 Russell King - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef __ASM_PROCINFO_H -#define __ASM_PROCINFO_H - -#define HWCAP_SWP 1 -#define HWCAP_HALF 2 -#define HWCAP_THUMB 4 -#define HWCAP_26BIT 8 /* Play it safe */ -#define HWCAP_FAST_MULT 16 -#define HWCAP_FPA 32 -#define HWCAP_VFP 64 -#define HWCAP_EDSP 128 -#define HWCAP_JAVA 256 -#define HWCAP_IWMMXT 512 -#define HWCAP_CRUNCH 1024 -#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 b2ebf4063..000000000 --- a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.30/headerfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: linux-2.6.30/include/linux/if_tunnel.h -=================================================================== ---- linux-2.6.30.orig/include/linux/if_tunnel.h 2009-08-27 14:34:49.000000000 +0100 -+++ linux-2.6.30/include/linux/if_tunnel.h 2009-08-27 14:35:04.000000000 +0100 -@@ -2,6 +2,7 @@ - #define _IF_TUNNEL_H_ - - #include <linux/types.h> -+#include <asm/byteorder.h> - - #ifdef __KERNEL__ - #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 1f567ca1d..e6cb1d866 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 @@ DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." SECTION = "devel" -LICENSE = "GPL" +LICENSE = "GPLv2" + +LIC_CHKSUM_FILES = "file://COPYING " +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2" #DEPENDS = "cross-linkage" RDEPENDS_${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 dc6338a95..719c32020 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 @@ # configuration are no longer needed, and they break setserial by making it # believe that it should compile in the code that supports this modem. -Index: linux-2.6.33/include/asm-generic/ioctls.h +2010/06/16 +Created-by: Jeff Dike <jdike@linux.intel.com> + +Index: linux-2.6.34/include/asm-generic/ioctls.h =================================================================== ---- linux-2.6.33.orig/include/asm-generic/ioctls.h -+++ linux-2.6.33/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 */ 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 000000000..81fa5ce8c --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers/ppc_glibc_build_fix.patch @@ -0,0 +1,25 @@ +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/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 e72d710c9..000000000 --- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb +++ /dev/null @@ -1,51 +0,0 @@ -require linux-libc-headers.inc - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native" -PR = "r10" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://procinfo.h \ - file://unifdef.patch;patch=1" - -S = "${WORKDIR}/linux-${PV}" - -set_arch() { - case ${TARGET_ARCH} in - alpha*) ARCH=alpha ;; - arm*) ARCH=arm ;; - cris*) ARCH=cris ;; - hppa*) ARCH=parisc ;; - i*86*) ARCH=i386 ;; - ia64*) ARCH=ia64 ;; - mips*) ARCH=mips ;; - m68k*) ARCH=m68k ;; - powerpc*) ARCH=powerpc ;; - s390*) ARCH=s390 ;; - sh*) ARCH=sh ;; - sparc64*) ARCH=sparc64 ;; - sparc*) ARCH=sparc ;; - x86_64*) ARCH=x86_64 ;; - avr32*) ARCH=avr32 ;; - bfin*) ARCH=blackfin ;; - esac -} - -do_configure() { - set_arch - oe_runmake allnoconfig ARCH=$ARCH -} - -do_compile () { -} - -do_install() { - set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH -} - -do_install_append_arm() { - cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/ -} - -BBCLASSEXTEND = "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 5b8e7a4fd..000000000 --- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.29.bb +++ /dev/null @@ -1,45 +0,0 @@ -require linux-libc-headers.inc - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native" -PR = "r2" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " - -S = "${WORKDIR}/linux-${PV}" - -set_arch() { - case ${TARGET_ARCH} in - alpha*) ARCH=alpha ;; - arm*) ARCH=arm ;; - cris*) ARCH=cris ;; - hppa*) ARCH=parisc ;; - i*86*) ARCH=i386 ;; - ia64*) ARCH=ia64 ;; - mips*) ARCH=mips ;; - m68k*) ARCH=m68k ;; - powerpc*) ARCH=powerpc ;; - s390*) ARCH=s390 ;; - sh*) ARCH=sh ;; - sparc64*) ARCH=sparc64 ;; - sparc*) ARCH=sparc ;; - x86_64*) ARCH=x86_64 ;; - avr32*) ARCH=avr32 ;; - bfin*) ARCH=blackfin ;; - esac -} - -do_configure() { - set_arch - oe_runmake allnoconfig ARCH=$ARCH -} - -do_compile () { -} - -do_install() { - set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH -} - -BBCLASSEXTEND = "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 9f7c484ee..000000000 --- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.30.bb +++ /dev/null @@ -1,46 +0,0 @@ -require linux-libc-headers.inc - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native" -PR = "r3" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://headerfix.patch;patch=1" - -S = "${WORKDIR}/linux-${PV}" - -set_arch() { - case ${TARGET_ARCH} in - alpha*) ARCH=alpha ;; - arm*) ARCH=arm ;; - cris*) ARCH=cris ;; - hppa*) ARCH=parisc ;; - i*86*) ARCH=i386 ;; - ia64*) ARCH=ia64 ;; - mips*) ARCH=mips ;; - m68k*) ARCH=m68k ;; - powerpc*) ARCH=powerpc ;; - s390*) ARCH=s390 ;; - sh*) ARCH=sh ;; - sparc64*) ARCH=sparc64 ;; - sparc*) ARCH=sparc ;; - x86_64*) ARCH=x86_64 ;; - avr32*) ARCH=avr32 ;; - bfin*) ARCH=blackfin ;; - esac -} - -do_configure() { - set_arch - oe_runmake allnoconfig ARCH=$ARCH -} - -do_compile () { -} - -do_install() { - set_arch - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH -} - -BBCLASSEXTEND = "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 a299f55c2..31c305854 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 INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r0" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://hayes-gone.patch" +SRC_URI += "file://hayes-gone.patch \ + file://ppc_glibc_build_fix.patch" S = "${WORKDIR}/linux-${PV}" @@ -25,8 +25,8 @@ set_arch() { sparc64*) ARCH=sparc64 ;; sparc*) ARCH=sparc ;; x86_64*) ARCH=x86_64 ;; - avr32*) ARCH=avr32 ;; - bfin*) ARCH=blackfin ;; + avr32*) ARCH=avr32 ;; + bfin*) ARCH=blackfin ;; esac } |