diff options
author | Tim Yamin <plasmaroo@gentoo.org> | 2005-11-18 23:46:23 +0000 |
---|---|---|
committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-11-18 23:46:23 +0000 |
commit | 5244de8ba96b188acd17d899cb6bfa86107cc29f (patch) | |
tree | 59b7fc3a8409884aa3335f7f871325849fd374a2 /sys-kernel/linux-headers | |
parent | Stable on x86; bug #112491 (diff) | |
download | gentoo-2-5244de8ba96b188acd17d899cb6bfa86107cc29f.tar.gz gentoo-2-5244de8ba96b188acd17d899cb6bfa86107cc29f.tar.bz2 gentoo-2-5244de8ba96b188acd17d899cb6bfa86107cc29f.zip |
Fix #82243, #100659, #104845, #108521.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-kernel/linux-headers')
4 files changed, 56 insertions, 3 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index 0477ec36b77b..6b0ed826fd42 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/linux-headers # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.148 2005/10/31 21:17:44 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.149 2005/11/18 23:46:23 plasmaroo Exp $ + +*linux-headers-2.6.11-r3 (18 Nov 2005) + + 18 Nov 2005; <plasmaroo@gentoo.org> +linux-headers-2.6.11-r3.ebuild: + Fix #82243, #100659, #104845, #108521. 31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> linux-headers-2.6.11-r2.ebuild: diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r3 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r3 new file mode 100644 index 000000000000..ab27b1b6c862 --- /dev/null +++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r3 @@ -0,0 +1,3 @@ +MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679 +MD5 0880556aadd7dc0b77258dcf4ea9b88b linux-2.6.11-m68k-headers.patch.bz2 12090 +MD5 add60b5600598ebf36fda5957f751ead gentoo-headers-2.6.11-6.tar.bz2 20684 diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild index 42b4d864f38e..373368723608 100644 --- a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild +++ b/sys-kernel/linux-headers/linux-headers-2.6.11-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.11-r2.ebuild,v 1.19 2005/10/31 21:17:44 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.20 2005/11/18 23:46:23 plasmaroo Exp $ ETYPE="headers" H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86" @@ -11,7 +11,7 @@ PATCHES_V='5' SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.11-m68k-headers.patch.bz2 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-headers/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2" -KEYWORDS="-* ~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86" # Not tested to be fully stable, if things break file bugs to plasmaroo please... +KEYWORDS="-* ~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86" DEPEND="ppc? ( gcc64? ( sys-devel/gcc-powerpc64 ) ) sparc? ( gcc64? ( sys-devel/gcc-sparc64 ) )" diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild new file mode 100644 index 000000000000..f422c0034548 --- /dev/null +++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild @@ -0,0 +1,45 @@ +# 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.11-r3.ebuild,v 1.1 2005/11/18 23:46:23 plasmaroo Exp $ + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86" +inherit eutils kernel-2 +detect_version + +PATCHES_V='6' + +SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.11-m68k-headers.patch.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-headers/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2" +KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" # Not tested to be fully stable, if things break file bugs to plasmaroo please... + +DEPEND="ppc? ( gcc64? ( sys-devel/gcc-powerpc64 ) ) + sparc? ( gcc64? ( sys-devel/gcc-sparc64 ) )" + +UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2" + +src_unpack() { + kernel-2_src_unpack + + # This should always be used but it has a bunch of hunks which + # apply to include/linux/ which i'm unsure of so only use with + # m68k for now (dont want to break other arches) + [[ $(tc-arch) == "m68k" ]] && epatch "${DISTDIR}"/linux-2.6.11-m68k-headers.patch.bz2 + + # Fixes ... all the mv magic is to keep sed from dumping + # ugly warnings about how it can't work on a directory. + cd "${S}"/include + mv asm-ia64/sn asm-ppc64/iSeries . + headers___fix asm-ia64/* + mv sn asm-ia64/ + headers___fix asm-ppc64/* + mv iSeries asm-ppc64/ + headers___fix asm-ppc64/iSeries/* + headers___fix linux/{ethtool,jiffies}.h + + # Apply patch for spinlick.h only with 32bit userland on ppc64. + # Will add to the main patchball when plasmaroo returns. + if use ppc && [[ ${PROFILE_ARCH} == "ppc64" ]]; then + epatch ${FILESDIR}/2.6.11-ppc64-32ul-spinlock.patch + fi +} |