From: Jeremy Huddleston Date: Thu, 13 Jan 2005 08:05:37 +0000 (+0000) Subject: Merged sparc-glibc.patch ingo appcompat.patch to avoid filecount bloat. Revbump... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d2357cda72f4f2198878ab448a19d7ca39d65dd;p=gentoo.git Merged sparc-glibc.patch ingo appcompat.patch to avoid filecount bloat. Revbump to add #include and force upgrade for people who grabbed it with the bad kernel-2.eclass. --- diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index 28dd09dca2f5..81d32cc7cae1 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/linux-headers # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.92 2005/01/12 05:09:25 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.93 2005/01/13 08:05:37 eradicator Exp $ + +*linux-headers-2.6.8.1-r4 (13 Jan 2005) + + 13 Jan 2005; Jeremy Huddleston + -files/generate-asm-amd64, files/linux-headers-2.6.8.1-appCompat.patch, + -files/linux-headers-2.6.8.1-sparc-glibcsafe.patch, + linux-headers-2.6.8.1-r2.ebuild, -linux-headers-2.6.8.1-r3.ebuild, + +linux-headers-2.6.8.1-r4.ebuild: + Merged sparc-glibc.patch ingo appcompat.patch to avoid filecount bloat. + Revbump to add #include and force upgrade for people who + grabbed it with the bad kernel-2.eclass. *linux-headers-2.6.8.1-r2 (11 Jan 2005) diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index 415100e7ddab..fcee838fa62d 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -1,47 +1,45 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 c17e6d7f0f0a7fa9bce17bbf65f31164 ChangeLog 21605 +MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820 MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509 -MD5 c28313e23ce24b05e25738a685a00cd4 linux-headers-2.4.26.ebuild 3351 MD5 93d61e502d62b73d3340cb8837b6d6b2 linux-headers-2.4.21-r1.ebuild 3945 MD5 abc5561a3a28d6614bd2235022eaadce linux-headers-2.4.21.ebuild 3731 MD5 213c9243211da20b5a7611507539e99b linux-headers-2.4.22.ebuild 4029 MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482 -MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290 MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422 -MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820 -MD5 4ed296103811c13515dd18af2c384764 linux-headers-2.6.8.1-r2.ebuild 1251 +MD5 c28313e23ce24b05e25738a685a00cd4 linux-headers-2.4.26.ebuild 3351 +MD5 a14381f850baf1b032c465a0194b1c14 ChangeLog 22132 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267 -MD5 f916ed8a952b57cc83eb21d99648fba2 linux-headers-2.6.8.1-r3.ebuild 1311 +MD5 a9b2cc4f73c94a6d16864269d5b94f68 linux-headers-2.6.8.1-r2.ebuild 1215 +MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290 +MD5 946112d280e8dc3b305ecd9709b38693 linux-headers-2.6.8.1-r4.ebuild 1221 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557 +MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67 -MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67 MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67 -MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661 -MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67 -MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66 +MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67 MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722 -MD5 e53ba5b835db95dad7965430051befa3 files/digest-linux-headers-2.6.8.1-r3 78 MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131 -MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386 MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r2 146 +MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661 +MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386 +MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352 MD5 6dd79a655f006aebb7206203f3654976 files/linux-headers-2.6.7-generic-arm-prepare.patch 978 -MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132 -MD5 8f3a515e5e309495343a3eef4721ddd6 files/linux-headers-2.6.8.1-appCompat.patch 56603 +MD5 4bedd531f77122bde6f1f54ea7ceb2f4 files/linux-headers-2.6.8.1-appCompat.patch 59863 MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640 -MD5 0a916feceed548fe9f4d40389373630d files/generate-asm-amd64 1643 -MD5 5258c64bed51646ee05cde4fbc40ae03 files/linux-headers-2.6.8.1-sparc-glibcsafe.patch 2886 MD5 9101139b0720280f338a1823c281ee84 files/linux-headers-2.6.8.1-parisc-syscall.patch 413 -MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352 +MD5 e53ba5b835db95dad7965430051befa3 files/digest-linux-headers-2.6.8.1-r4 78 +MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132 +MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.14 (GNU/Linux) +Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB5LRDroRuSHgZdywRAt5tAJ0RE+YzVDkzeYOIWFyETbWOLq+9JwCfXxuZ -Orp7ks6COflQvf3O8ODSycU= -=n5Rw +iD8DBQFB5ivbArHZZzCEUG0RAt9nAJ9b57Lv6drTtdLbmDDo1T13wLdufQCfRR9l +zRFwckuDx199WHT4u9ig5Ek= +=chFc -----END PGP SIGNATURE----- diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.8.1-r3 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.8.1-r4 similarity index 100% rename from sys-kernel/linux-headers/files/digest-linux-headers-2.6.8.1-r3 rename to sys-kernel/linux-headers/files/digest-linux-headers-2.6.8.1-r4 diff --git a/sys-kernel/linux-headers/files/generate-asm-amd64 b/sys-kernel/linux-headers/files/generate-asm-amd64 deleted file mode 100644 index b005109b21d8..000000000000 --- a/sys-kernel/linux-headers/files/generate-asm-amd64 +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -e -# -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/generate-asm-amd64,v 1.1 2005/01/12 05:09:25 eradicator Exp $ -# -# This script generates the files in /usr/include/asm for sparc systems -# during installation of sys-kernel/linux-headers. -# Will no longer be needed when full 64 bit support is used on sparc64 -# systems. -# -# Shamefully ripped from Debian -# ---------------------------------------------------------------------- - -# Idea borrowed from RedHat's kernel package - -if [ -n "$1" ]; then - if [ ! -d "$1" ]; then - echo "$1" does not exist, or is not a directory - exit 1 - fi - cd $1 -else - cd /usr/include -fi - -if [ ! -d asm-i386 -o ! -d asm-x86_64 ] ; then - echo E: asm-i386 and asm-x86_64 must exist, or you will have problems - exit 1 -fi - -rm -rf asm -mkdir asm - -for h in `( ls asm-i386; ls asm-x86_64 ) | grep '\.h$' | sort -u`; do - name=`echo $h | tr a-z. A-Z_` - # common header - cat > asm/$h << EOF -/* All asm/ files are generated and point to the corresponding - * file in asm-i386 or asm-x86_64. To regenerate, run "generate-asm" - */ - -#ifndef __ASM_STUB__${name}__ -#define __ASM_STUB__${name}__ - -EOF - - # common for sparc and sparc64 - if [ -f asm-i386/$h -a -f asm-x86_64/$h ]; then - cat >> asm/$h < -#else -#include -#endif -EOF - - # sparc only - elif [ -f asm-i386/$h ]; then - cat >> asm/$h < -#endif -EOF - # sparc64 only - else - cat >> asm/$h < -#endif -EOF - fi - - # common footer - cat >> asm/$h < Mike Frysinger Martin Schlemmer + Jeremy Huddleston This patch neatens up the 2.6 headers for user-space usage and allows backward compatibility on a variety of applications which are designed for 2.4 headers. @@ -1817,3 +1818,132 @@ diff -ur linux-2.6.8.1/include/linux/preempt.h linux-2.6.8.1-gentoo/include/linu #define preempt_count() (current_thread_info()->preempt_count) +--- linux/include/asm-sparc/processor.h.orig 2004-12-11 22:21:32.889748424 -0800 ++++ linux/include/asm-sparc/processor.h 2004-12-11 22:21:21.616462224 -0800 +@@ -43,7 +43,11 @@ + + struct task_struct; + +-struct fpq { ++#ifdef __KERNEL__ ++#define __fpq fpq ++#endif ++ ++struct __fpq { + unsigned long *insn_addr; + unsigned long insn; + }; +@@ -65,13 +69,17 @@ struct thread_struct { + unsigned long float_regs[32] __attribute__ ((aligned (8))); + unsigned long fsr; + unsigned long fpqdepth; +- struct fpq fpqueue[16]; ++ struct __fpq fpqueue[16]; + unsigned long flags; + mm_segment_t current_ds; + struct exec core_exec; /* just what it says. */ + int new_signal; + }; + ++#ifdef __KERNEL__ ++#undef __fpq ++#endif ++ + #define SPARC_FLAG_KTHREAD 0x1 /* task is a kernel thread */ + #define SPARC_FLAG_UNALIGNED 0x2 /* is allowed to do unaligned accesses */ + +--- linux/include/asm-sparc/sigcontext.h.orig 2004-12-11 22:21:32.890748272 -0800 ++++ linux/include/asm-sparc/sigcontext.h 2004-12-11 22:21:01.759480944 -0800 +@@ -4,7 +4,6 @@ + + #ifdef __KERNEL__ + #include +-#endif + + #ifndef __ASSEMBLY__ + +@@ -57,8 +56,6 @@ typedef struct { + } si_fpqueue [16]; + } __siginfo_fpu_t; + +-#ifdef __KERNEL__ +- + /* This magic should be in g_upper[0] for all upper parts + to be valid. + This is generated by sparc64 only, but for 32bit processes, +@@ -69,8 +66,9 @@ typedef struct { + unsigned int o_upper[8]; + } siginfo_extra_v8plus_t; + +-#endif +- + #endif /* !(__ASSEMBLY__) */ + ++#endif /* (__KERNEL__) */ ++ + #endif /* !(__SPARC_SIGCONTEXT_H) */ ++ +--- linux/include/asm-sparc/signal.h.orig 2004-12-11 22:21:32.891748120 -0800 ++++ linux/include/asm-sparc/signal.h 2004-12-11 22:21:01.768479576 -0800 +@@ -3,6 +3,7 @@ + #define _ASMSPARC_SIGNAL_H + + #include ++#include + + #ifdef __KERNEL__ + #ifndef __ASSEMBLY__ +@@ -113,11 +114,14 @@ typedef struct { + unsigned long sig[_NSIG_WORDS]; + } __new_sigset_t; + ++ ++#ifdef __KERNEL__ + /* A SunOS sigstack */ + struct sigstack { + char *the_stack; + int cur_status; + }; ++#endif + + /* Sigvec flags */ + #define _SV_SSTACK 1u /* This signal handler should use sig-stack */ +@@ -191,6 +195,7 @@ typedef void (*__sighandler_t)(int); + #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ + #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ + ++#ifdef __KERNEL__ + struct __new_sigaction { + __sighandler_t sa_handler; + unsigned long sa_flags; +@@ -198,12 +203,10 @@ struct __new_sigaction { + __new_sigset_t sa_mask; + }; + +-#ifdef __KERNEL__ + struct k_sigaction { + struct __new_sigaction sa; + void __user *ka_restorer; + }; +-#endif + + struct __old_sigaction { + __sighandler_t sa_handler; +@@ -218,7 +221,6 @@ typedef struct sigaltstack { + size_t ss_size; + } stack_t; + +-#ifdef __KERNEL__ + struct sparc_deliver_cookie { + int restart_syscall; + unsigned long orig_i0; +--- linux-2.6.0/include/linux/blkpg.h.orig 2005-01-12 23:15:25.000000000 -0800 ++++ linux-2.6.0/include/linux/blkpg.h 2005-01-12 23:16:05.000000000 -0800 +@@ -25,6 +25,7 @@ + * For today, only the partition stuff - aeb, 990515 + */ + #include ++#include + + #define BLKPG _IO(0x12,105) + diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-sparc-glibcsafe.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-sparc-glibcsafe.patch deleted file mode 100644 index 9bddffada13c..000000000000 --- a/sys-kernel/linux-headers/files/linux-headers-2.6.8.1-sparc-glibcsafe.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- linux/include/asm-sparc/processor.h.orig 2004-12-11 22:21:32.889748424 -0800 -+++ linux/include/asm-sparc/processor.h 2004-12-11 22:21:21.616462224 -0800 -@@ -43,7 +43,11 @@ - - struct task_struct; - --struct fpq { -+#ifdef __KERNEL__ -+#define __fpq fpq -+#endif -+ -+struct __fpq { - unsigned long *insn_addr; - unsigned long insn; - }; -@@ -65,13 +69,17 @@ struct thread_struct { - unsigned long float_regs[32] __attribute__ ((aligned (8))); - unsigned long fsr; - unsigned long fpqdepth; -- struct fpq fpqueue[16]; -+ struct __fpq fpqueue[16]; - unsigned long flags; - mm_segment_t current_ds; - struct exec core_exec; /* just what it says. */ - int new_signal; - }; - -+#ifdef __KERNEL__ -+#undef __fpq -+#endif -+ - #define SPARC_FLAG_KTHREAD 0x1 /* task is a kernel thread */ - #define SPARC_FLAG_UNALIGNED 0x2 /* is allowed to do unaligned accesses */ - ---- linux/include/asm-sparc/sigcontext.h.orig 2004-12-11 22:21:32.890748272 -0800 -+++ linux/include/asm-sparc/sigcontext.h 2004-12-11 22:21:01.759480944 -0800 -@@ -4,7 +4,6 @@ - - #ifdef __KERNEL__ - #include --#endif - - #ifndef __ASSEMBLY__ - -@@ -57,8 +56,6 @@ typedef struct { - } si_fpqueue [16]; - } __siginfo_fpu_t; - --#ifdef __KERNEL__ -- - /* This magic should be in g_upper[0] for all upper parts - to be valid. - This is generated by sparc64 only, but for 32bit processes, -@@ -69,8 +66,9 @@ typedef struct { - unsigned int o_upper[8]; - } siginfo_extra_v8plus_t; - --#endif -- - #endif /* !(__ASSEMBLY__) */ - -+#endif /* (__KERNEL__) */ -+ - #endif /* !(__SPARC_SIGCONTEXT_H) */ -+ ---- linux/include/asm-sparc/signal.h.orig 2004-12-11 22:21:32.891748120 -0800 -+++ linux/include/asm-sparc/signal.h 2004-12-11 22:21:01.768479576 -0800 -@@ -3,6 +3,7 @@ - #define _ASMSPARC_SIGNAL_H - - #include -+#include - - #ifdef __KERNEL__ - #ifndef __ASSEMBLY__ -@@ -113,11 +114,14 @@ typedef struct { - unsigned long sig[_NSIG_WORDS]; - } __new_sigset_t; - -+ -+#ifdef __KERNEL__ - /* A SunOS sigstack */ - struct sigstack { - char *the_stack; - int cur_status; - }; -+#endif - - /* Sigvec flags */ - #define _SV_SSTACK 1u /* This signal handler should use sig-stack */ -@@ -191,6 +195,7 @@ typedef void (*__sighandler_t)(int); - #define SIG_IGN ((__sighandler_t)1) /* ignore signal */ - #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ - -+#ifdef __KERNEL__ - struct __new_sigaction { - __sighandler_t sa_handler; - unsigned long sa_flags; -@@ -198,12 +203,10 @@ struct __new_sigaction { - __new_sigset_t sa_mask; - }; - --#ifdef __KERNEL__ - struct k_sigaction { - struct __new_sigaction sa; - void __user *ka_restorer; - }; --#endif - - struct __old_sigaction { - __sighandler_t sa_handler; -@@ -218,7 +221,6 @@ typedef struct sigaltstack { - size_t ss_size; - } stack_t; - --#ifdef __KERNEL__ - struct sparc_deliver_cookie { - int restart_syscall; - unsigned long orig_i0; diff --git a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild index 1ae9bc14199d..4a5780d475e3 100644 --- a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild +++ b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild,v 1.1 2005/01/12 02:09:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r2.ebuild,v 1.2 2005/01/13 08:05:37 eradicator Exp $ ETYPE="headers" H_SUPPORTEDARCH="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc sh x86" @@ -15,7 +15,6 @@ UNIPATCH_LIST="${DISTDIR}/linux-2.6.8.1-sh-headers.patch.bz2 ${FILESDIR}/${PN}-2.6.7-generic-arm-prepare.patch ${FILESDIR}/${P}-strict-ansi-fix.patch ${FILESDIR}/${P}-appCompat.patch - ${FILESDIR}/${P}-sparc-glibcsafe.patch ${FILESDIR}/${PN}-soundcard-ppc64.patch ${FILESDIR}/${P}-arm-float.patch ${FILESDIR}/${P}-parisc-syscall.patch" diff --git a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r3.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild similarity index 82% rename from sys-kernel/linux-headers/linux-headers-2.6.8.1-r3.ebuild rename to sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild index 3b0bdd2c9473..4b2a7b50ec14 100644 --- a/sys-kernel/linux-headers/linux-headers-2.6.8.1-r3.ebuild +++ b/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild @@ -1,15 +1,13 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r3.ebuild,v 1.1 2005/01/12 05:09:25 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.8.1-r4.ebuild,v 1.1 2005/01/13 08:05:37 eradicator Exp $ ETYPE="headers" H_SUPPORTEDARCH="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc sh x86" inherit kernel-2 SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.8.1-sh-headers.patch.bz2" -# This version is just here to correspond to linux26-headers-2.6.8.1-r3 which -# was just created for amd64. -KEYWORDS="amd64" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~sh ~x86" UNIPATCH_LIST="${DISTDIR}/linux-2.6.8.1-sh-headers.patch.bz2 ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch @@ -17,7 +15,6 @@ UNIPATCH_LIST="${DISTDIR}/linux-2.6.8.1-sh-headers.patch.bz2 ${FILESDIR}/${PN}-2.6.7-generic-arm-prepare.patch ${FILESDIR}/${P}-strict-ansi-fix.patch ${FILESDIR}/${P}-appCompat.patch - ${FILESDIR}/${P}-sparc-glibcsafe.patch ${FILESDIR}/${PN}-soundcard-ppc64.patch ${FILESDIR}/${P}-arm-float.patch ${FILESDIR}/${P}-parisc-syscall.patch"