Revision bump to genpatches-2.6.14-7 and updated mce-config.patch.

Package-Manager: portage-2.0.53

6 files changed, 128 insertions, 2 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index d05eb91e5235..6e68b3caeea6 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/suspend2-sources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.29 2005/12/27 22:02:27 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.30 2005/12/29 23:18:01 brix Exp $
+
+*suspend2-sources-2.6.14-r9 (29 Dec 2005)
+
+  29 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/suspend2-2.2-rc15-mce-config-2.patch,
+  +files/suspend2-2.2-rc15-processor.h.patch,
+  +suspend2-sources-2.6.14-r9.ebuild:
+  Revision bump to genpatches-2.6.14-7 and updated mce-config.patch.
 
 *suspend2-sources-2.6.14-r8 (27 Dec 2005)
 
diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index 7683af4dd32f..195e9fa14f54 100644
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 dc0d28edfd44060d2a0884f697959a42 ChangeLog 7042
+MD5 b74eb559639307dfba3fd41e14925802 ChangeLog 7340
 MD5 8c885e50de95004ba759a137c3f93495 files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch 877
 MD5 a67db8b8f894652b4d1456406d307a37 files/digest-suspend2-sources-2.6.13 310
 MD5 5ff92c313009119044ed51956fb509f9 files/digest-suspend2-sources-2.6.13-r1 310
@@ -12,6 +12,7 @@ MD5 92ba5acc4df4d19ceaa8d998eb57738d files/digest-suspend2-sources-2.6.14-r5 303
 MD5 55fb5d3c6fea0515663795871515faf9 files/digest-suspend2-sources-2.6.14-r6 303
 MD5 55fb5d3c6fea0515663795871515faf9 files/digest-suspend2-sources-2.6.14-r7 303
 MD5 da3f42bad1e36436b75ebe041d853c0a files/digest-suspend2-sources-2.6.14-r8 303
+MD5 d7831b5753d35ae55b212e95a7bc955f files/digest-suspend2-sources-2.6.14-r9 303
 MD5 d1eff82a3bab3c5b67dec45a552888e4 files/linux-2.6.13-poweroff.patch 500
 MD5 4c9a2a6532217c3e54a52f6633e33c9f files/suspend2-2.2-rc13-filewriter.patch 5283
 MD5 3a1912556d15f96edb9a356555dadf67 files/suspend2-2.2-rc14-do-correct-init-routine.patch 744
@@ -21,9 +22,11 @@ MD5 55ffe19645dea1cc8df6866ff95737dd files/suspend2-2.2-rc14-select-hotplug-cpu-
 MD5 ae183cf8eb4f23506651725c3ba32f67 files/suspend2-2.2-rc14-test-filewriter.patch 6262
 MD5 f4d1a2c278cb3e823c8f7da71afed4ee files/suspend2-2.2-rc15-get-next-bit-on.patch 5368
 MD5 aa1349c52fa5f56680b2e612d415a6cb files/suspend2-2.2-rc15-listen-to-abort-request.patch 956
+MD5 dec43394d8b62fa7d06a6ad8ddf3c63b files/suspend2-2.2-rc15-mce-config-2.patch 876
 MD5 7761c9dd108bf9dca9d3427b721f44f1 files/suspend2-2.2-rc15-mce-config.patch 873
 MD5 d33577823e512a90a2b24754f74fdc07 files/suspend2-2.2-rc15-no-pageflags.patch 998
 MD5 6cd7d0c37cc50881f3d3b0feffedb4f1 files/suspend2-2.2-rc15-pageflags.h.patch 3990
+MD5 e85851586d845a8b1d841ae93444d28b files/suspend2-2.2-rc15-processor.h.patch 583
 MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275
 MD5 df999badafc06dd65c6f777b684ad9d6 suspend2-sources-2.6.13-r1.ebuild 2006
 MD5 5d404bb0571ae11e7702c33c9577af76 suspend2-sources-2.6.13-r2.ebuild 1967
@@ -36,4 +39,5 @@ MD5 5cfda97b5ce288a6978bc4cb747df913 suspend2-sources-2.6.14-r5.ebuild 1809
 MD5 ef0d8e7f3382db7f92650dca96517ac3 suspend2-sources-2.6.14-r6.ebuild 1762
 MD5 47b7971f89ffc40fd62aded939d754c3 suspend2-sources-2.6.14-r7.ebuild 2079
 MD5 d472627bfcb34566f5b3ef71e410737a suspend2-sources-2.6.14-r8.ebuild 2019
+MD5 e88e904ea7b2db03adb7e231ec6d95b4 suspend2-sources-2.6.14-r9.ebuild 2069
 MD5 a24f87b3199f5a851070c6ce817dc3ca suspend2-sources-2.6.14.ebuild 1758
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r9 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r9
new file mode 100644
index 000000000000..d0a1daac0021
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r9
@@ -0,0 +1,4 @@
+MD5 6089934d545add3a13cda2b32127af95 genpatches-2.6.14-7.base.tar.bz2 52548
+MD5 44829e05b45d03c70ddf794fece4c202 genpatches-2.6.14-7.extras.tar.bz2 143076
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+MD5 a390d689dc5de91222f905cae7d0d406 suspend2-2.2-rc15-for-2.6.14.tar.bz2 113332
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch
new file mode 100644
index 000000000000..90f58941be3b
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch
@@ -0,0 +1,30 @@
+Hi.
+
+I have a better solution to the mce reinit issue. This patch also
+removes the warning that the previous iteration created.
+
+Regards,
+
+Nigel
+
+ suspend2.h |    1 +
+ 1 files changed, 1 insertion(+)
+diff -ruNp 9010-mce-config.patch-old/include/asm-i386/suspend2.h 9010-mce-config.patch-new/include/asm-i386/suspend2.h
+--- 9010-mce-config.patch-old/include/asm-i386/suspend2.h	2005-12-28 09:59:00.000000000 +1000
++++ 9010-mce-config.patch-new/include/asm-i386/suspend2.h	2005-12-28 07:03:07.000000000 +1000
+@@ -10,6 +10,7 @@
+ #include <asm/i387.h>
+ #include <asm/tlbflush.h>
+ #include <asm/desc.h>
++#include <asm/processor.h>
+ 
+ /* image of the saved processor states */
+ struct suspend2_saved_context {
+
+
+
+_______________________________________________
+Suspend2-devel mailing list
+Suspend2-devel@lists.suspend2.net
+http://lists.suspend2.net/mailman/listinfo/suspend2-devel
+
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch
new file mode 100644
index 000000000000..5ea203e7855e
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch
@@ -0,0 +1,14 @@
+diff -ruNp 9011-processor.h.patch-old/include/asm-i386/processor.h 9011-processor.h.patch-new/include/asm-i386/processor.h
+--- 9011-processor.h.patch-old/include/asm-i386/processor.h	2005-10-28 02:02:08.000000000 +0200
++++ 9011-processor.h.patch-new/include/asm-i386/processor.h	2005-12-29 21:40:37.000000000 +0100
+@@ -718,4 +718,10 @@ extern void mtrr_bp_init(void);
+ #define mtrr_bp_init() do {} while (0)
+ #endif
+ 
++#ifdef CONFIG_X86_MCE
++extern void mcheck_init(struct cpuinfo_x86 *c);
++#else
++#define mcheck_init(c) do {} while(0)
++#endif
++
+ #endif /* __ASM_I386_PROCESSOR_H */
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r9.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r9.ebuild
new file mode 100644
index 000000000000..ffdb4272359b
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r9.ebuild,v 1.1 2005/12/29 23:18:02 brix Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+
+inherit eutils kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="Software Suspend 2 + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net"
+
+SUSPEND2_VERSION="2.2-rc15"
+SUSPEND2_TARGET="${PV}"
+SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}"
+SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2"
+
+UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2
+${FILESDIR}/suspend2-2.2-rc15-no-pageflags.patch
+${FILESDIR}/suspend2-2.2-rc15-mce-config-2.patch
+${FILESDIR}/suspend2-2.2-rc15-processor.h.patch
+${FILESDIR}/suspend2-2.2-rc15-listen-to-abort-request.patch
+${FILESDIR}/suspend2-2.2-rc15-get-next-bit-on.patch
+${FILESDIR}/suspend2-2.2-rc15-pageflags.h.patch"
+
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt
+${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}"
+
+KEYWORDS="~x86"
+
+IUSE="ultra1"
+RDEPEND="${RDEPEND}
+		>=sys-apps/suspend2-userui-0.6.1
+		>=sys-power/hibernate-script-1.12"
+
+K_EXTRAEINFO="If there are issues with this kernel, please direct any
+queries to the suspend2-users mailing list:
+http://lists.suspend2.net/mailman/listinfo/suspend2-users/"
+
+pkg_setup() {
+	if use sparc; then
+		# hme lockup hack on ultra1
+		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
+	fi
+}
+
+pkg_postinst() {
+	postinst_sources
+
+	echo
+
+	if [ "${ARCH}" = "sparc" ]; then
+		if [ x"`cat /proc/openprom/name 2>/dev/null`" \
+			 = x"'SUNW,Ultra-1'" ]; then
+			einfo "For users with an Enterprise model Ultra 1 using the HME"
+			einfo "network interface, please emerge the kernel using the"
+			einfo "following command: USE=ultra1 emerge ${PN}"
+		fi
+	fi
+}