From 09d07e1e1acb998cc6a02fa5aefdbd73458c0273 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Mon, 14 Jun 2004 18:54:22 +0000 Subject: Added a patch for the FPU-lockup issue; please see bug #58304 for details. --- sys-kernel/vserver-sources/ChangeLog | 9 ++++- .../files/digest-vserver-sources-2.4.26.1.3.9 | 2 -- .../files/digest-vserver-sources-2.4.26.1.3.9-r1 | 2 ++ ...rver-sources-2.4.26.1.3.9.FPULockup-53804.patch | 11 ++++++ .../vserver-sources-2.4.26.1.3.9-r1.ebuild | 42 ++++++++++++++++++++++ .../vserver-sources-2.4.26.1.3.9.ebuild | 41 --------------------- 6 files changed, 63 insertions(+), 44 deletions(-) delete mode 100644 sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9 create mode 100644 sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9-r1 create mode 100644 sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch create mode 100644 sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9-r1.ebuild delete mode 100644 sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog index 0b61300a122e..17808a9e2b8e 100644 --- a/sys-kernel/vserver-sources/ChangeLog +++ b/sys-kernel/vserver-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/vserver-sources # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.7 2004/06/02 16:35:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.8 2004/06/14 18:54:22 plasmaroo Exp $ + +*vserver-sources-2.4.26.1.3.9-r1 (14 Jun 2004) + + 14 Jun 2004; +vserver-sources-2.4.26.1.3.9-r1.ebuild, + -vserver-sources-2.4.26.1.3.9.ebuild, + +files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch: + Added a patch for the FPU-lockup issue; please see bug #58304 for details. *vserver-sources-2.4.26.1.3.9 (02 Jun 2004) diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9 deleted file mode 100644 index e4741e15a0e6..000000000000 --- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 -MD5 19c74eacff165c675bae637d50116369 linux-vserver-1.3.9.tar.bz2 52523 diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9-r1 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9-r1 new file mode 100644 index 000000000000..e4741e15a0e6 --- /dev/null +++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9-r1 @@ -0,0 +1,2 @@ +MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 +MD5 19c74eacff165c675bae637d50116369 linux-vserver-1.3.9.tar.bz2 52523 diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch new file mode 100644 index 000000000000..1dd5ed87b520 --- /dev/null +++ b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch @@ -0,0 +1,11 @@ +--- linux-2.4/include/asm-i386/i387.h 2004-06-13 20:06:05.044881328 +0100 ++++ linux-2.4/include/asm-i386/i387.h 2004-06-13 20:25:42.836829736 +0100 +@@ -34,7 +34,7 @@ + + #define clear_fpu( tsk ) do { \ + if ( tsk->flags & PF_USEDFPU ) { \ +- asm volatile("fwait"); \ ++ asm volatile("fnclex ; fwait"); \ + tsk->flags &= ~PF_USEDFPU; \ + stts(); \ + } \ diff --git a/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9-r1.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9-r1.ebuild new file mode 100644 index 000000000000..bc5286b11d89 --- /dev/null +++ b/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9-r1.ebuild,v 1.1 2004/06/14 18:54:22 plasmaroo Exp $ + +ETYPE="sources" +inherit kernel eutils +OKV=2.4.26 +KV=2.4.26 + +## idea: after the kernel-version (2.4.26) we append the vs-version (e.g. 1.3.9) to +## get 2.4.25.1.3.9 that is globbed out here: +VEXTRAVERSION="-vs${PV#*.*.*.}" +EXTRAVERSION="-vs${PV#*.*.*.}-${PR}" + +S=${WORKDIR}/linux-${KV} +# What's in this kernel? + +# INCLUDED: +# stock 2.4.26 kernel sources (or newer) +# devel-version of vsever-patch: 1.3.9 (or newer) + +DESCRIPTION="Linux kernel with DEVEL version ctx-/vserver-patch" +SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 + http://www.13thfloor.at/vserver/d_release/${VEXTRAVERSION/-vs/v}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2" +HOMEPAGE="http://www.kernel.org/ http://www.13thfloor.at/vserver/ http://www.linux-vserver.org/" + +KEYWORDS="~x86 -ppc" +SLOT="${KV}" + +src_unpack() { + unpack linux-${OKV}.tar.bz2 + cd ${WORKDIR} + mv linux-${OKV} linux-${KV}${VEXTRAVERSION} + + tar xvjf ${DISTDIR}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2 || die "Unpacking patch failed!" + + cd linux-${KV}${VEXTRAVERSION} + epatch ${WORKDIR}/patch-${KV}${VEXTRAVERSION}.diff + epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!" + epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" + kernel_universal_unpack +} diff --git a/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild deleted file mode 100644 index 25e2ff6133f5..000000000000 --- a/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild,v 1.2 2004/06/03 12:15:29 plasmaroo Exp $ - -ETYPE="sources" -inherit kernel eutils -OKV=2.4.26 -KV=2.4.26 - -## idea: after the kernel-version (2.4.26) we append the vs-version (e.g. 1.3.9) to -## get 2.4.25.1.3.9 that is globbed out here: -EXTRAVERSION="-vs${PV#*.*.*.}" - -S=${WORKDIR}/linux-${KV} -# What's in this kernel? - -# INCLUDED: -# stock 2.4.26 kernel sources (or newer) -# devel-version of vsever-patch: 1.3.9 (or newer) - -DESCRIPTION="Linux kernel with DEVEL version ctx-/vserver-patch" -SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - http://www.13thfloor.at/vserver/d_release/${EXTRAVERSION/-vs/v}/linux-vserver-${EXTRAVERSION/-vs/}.tar.bz2" -HOMEPAGE="http://www.kernel.org/ http://www.13thfloor.at/vserver/ http://www.linux-vserver.org/" - -KEYWORDS="~x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OKV}.tar.bz2 - cd ${WORKDIR} - mv linux-${OKV} linux-${KV}${EXTRAVERSION} - - tar xvjf ${DISTDIR}/linux-vserver-${EXTRAVERSION/-vs/}.tar.bz2 || die "Unpacking patch failed!" - - cd linux-${KV}${EXTRAVERSION} - epatch ${WORKDIR}/patch-${KV}${EXTRAVERSION}.diff - epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!" - - kernel_universal_unpack -} -- cgit v1.2.3-65-gdbad