Revision bump to genpatches-2.6.15-2, bug #118692, + patches from upstream.

Package-Manager: portage-2.0.53

10 files changed, 233 insertions, 2 deletions

diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog
index 351ccd892ff9..dd10d62fb412 100644
--- a/sys-kernel/suspend2-sources/ChangeLog
+++ b/sys-kernel/suspend2-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/suspend2-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.32 2006/01/09 13:32:55 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.33 2006/01/11 23:37:01 brix Exp $
+
+*suspend2-sources-2.6.15-r1 (11 Jan 2006)
+
+  11 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/suspend2-2.2-rc16-amd64-is-ram.patch,
+  +files/suspend2-2.2-rc16-debug-rodata-define.patch,
+  +files/suspend2-2.2-rc16-remove-block-dump.patch,
+  +files/suspend2-2.2-rc16-swapwriter-selects-swap.patch,
+  +files/suspend2-2.2-rc16-workqueue-post-suspend2.patch,
+  +files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch,
+  +suspend2-sources-2.6.15-r1.ebuild:
+  Revision bump to genpatches-2.6.15-2, bug #118692, + patches from upstream.
 
 *suspend2-sources-2.6.15 (09 Jan 2006)
 
diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest
index 6e52e43b059f..274d65303252 100644
--- a/sys-kernel/suspend2-sources/Manifest
+++ b/sys-kernel/suspend2-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 6f36aafe88a7fa18d05d730453d27182 ChangeLog 7734
+MD5 fdc6932a50c212e0d401b3d6abffc6f6 ChangeLog 8274
 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
@@ -15,6 +15,7 @@ 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 be9478be473d2185379b70443b714c65 files/digest-suspend2-sources-2.6.15 302
+MD5 514a1a6b724c2da7d174db76741c1a31 files/digest-suspend2-sources-2.6.15-r1 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
@@ -29,6 +30,12 @@ MD5 7761c9dd108bf9dca9d3427b721f44f1 files/suspend2-2.2-rc15-mce-config.patch 87
 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 417ee135d00c8e35c1f576c37f55e2d8 files/suspend2-2.2-rc16-amd64-is-ram.patch 1574
+MD5 9e649815f55422127e1e239627ee2971 files/suspend2-2.2-rc16-debug-rodata-define.patch 1155
+MD5 ff097383fa8607f8da27f2d62fe3e313 files/suspend2-2.2-rc16-remove-block-dump.patch 1037
+MD5 003a076c7965317f25792c5ee8c59b76 files/suspend2-2.2-rc16-swapwriter-selects-swap.patch 656
+MD5 7b1dd9333115cf6aa3ca5241f5f07392 files/suspend2-2.2-rc16-workqueue-post-suspend2.patch 462
+MD5 f3c382e7ff5bc9c62f303b6482a5b434 files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch 480
 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
@@ -44,4 +51,5 @@ 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
+MD5 498a52cfb7b6046820f62cfbe3bfd7d3 suspend2-sources-2.6.15-r1.ebuild 2100
 MD5 f6140ecc2feb0c046a6d5cb812bce375 suspend2-sources-2.6.15.ebuild 1759
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r1
new file mode 100644
index 000000000000..8cac6a6a1d13
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r1
@@ -0,0 +1,4 @@
+MD5 2673e8dcce81159f82aa457fd4c5591c genpatches-2.6.15-2.base.tar.bz2 15169
+MD5 484d94377e15e4ab3ddf84b897d8a09d genpatches-2.6.15-2.extras.tar.bz2 175417
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+MD5 b9e02ade7b5a1f41b5efbe693d3520e3 suspend2-2.2-rc16-for-2.6.15.tar.bz2 112822
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-is-ram.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-is-ram.patch
new file mode 100644
index 000000000000..ec5d8980562d
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-is-ram.patch
@@ -0,0 +1,41 @@
+Hi.
+
+The vanilla AMD64 code doesn't include a page_is_ram function so I implemented one, and managed to get it horribly wrong, but didn't notice until this morning. This patch fixes the issue.
+
+Regards,
+
+Nigel
+
+ arch/x86_64/kernel/e820.c |    2 +-
+ include/asm-x86_64/page.h |    2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+diff -ruNp 9180-amd64-page-is-ram.patch-old/arch/x86_64/kernel/e820.c 9180-amd64-page-is-ram.patch-new/arch/x86_64/kernel/e820.c
+--- 9180-amd64-page-is-ram.patch-old/arch/x86_64/kernel/e820.c	2006-01-10 13:20:41.000000000 +1000
++++ 9180-amd64-page-is-ram.patch-new/arch/x86_64/kernel/e820.c	2006-01-10 12:48:26.000000000 +1000
+@@ -197,7 +197,7 @@ int page_is_ram(unsigned long pagenr)
+ 		    ei->addr >= (start + PAGE_SIZE))
+ 			continue;
+ 
+-		return (ei->type != E820_RAM);
++		return (ei->type == E820_RAM);
+ 	}
+ 
+ 	return 0;
+diff -ruNp 9180-amd64-page-is-ram.patch-old/include/asm-x86_64/page.h 9180-amd64-page-is-ram.patch-new/include/asm-x86_64/page.h
+--- 9180-amd64-page-is-ram.patch-old/include/asm-x86_64/page.h	2006-01-03 15:08:44.000000000 +1000
++++ 9180-amd64-page-is-ram.patch-new/include/asm-x86_64/page.h	2006-01-10 12:48:26.000000000 +1000
+@@ -93,6 +93,8 @@ typedef struct { unsigned long pgprot; }
+ 
+ #include <asm/bug.h>
+ 
++extern int page_is_ram(unsigned long pagenr);
++
+ #endif /* __ASSEMBLY__ */
+ 
+ #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+
+_______________________________________________
+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-rc16-debug-rodata-define.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-rodata-define.patch
new file mode 100644
index 000000000000..9c031e152c7d
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-rodata-define.patch
@@ -0,0 +1,29 @@
+Hi.
+
+Per Bojan's email from earlier in the day, this patch fixes a typo in the arch /config specific code for determining whether a page should be saved.
+
+Nigel
+
+ prepare_image.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+diff -ruNp 9160-debug-rodata-define.patch-old/kernel/power/prepare_image.c 9160-debug-rodata-define.patch-new/kernel/power/prepare_image.c
+--- 9160-debug-rodata-define.patch-old/kernel/power/prepare_image.c	2006-01-10 13:22:07.000000000 +1000
++++ 9160-debug-rodata-define.patch-new/kernel/power/prepare_image.c	2006-01-10 12:48:26.000000000 +1000
+@@ -228,8 +228,10 @@ static struct page *rodata_start, *rodat
+ static struct page *rotext_start, *rotext_end;
+ static struct page *nosave_start, *nosave_end;
+ static struct page *rtas_start, *rtas_end;
+-#ifdef CONFIG_PPC_RTAS
++#ifdef CONFIG_DEBUG_RODATA
+ extern char __start_rodata, __end_rodata;
++#endif
++#ifdef CONFIG_PPC_RTAS
+ extern unsigned int rtas_data, rtas_size;
+ #endif
+ #ifdef CONFIG_PPC
+
+_______________________________________________
+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-rc16-remove-block-dump.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-remove-block-dump.patch
new file mode 100644
index 000000000000..b82e2495ff41
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-remove-block-dump.patch
@@ -0,0 +1,34 @@
+Hi.
+
+This patch removes some debugging code that was using the block dump code to help diagnose some recent issues. I believe it's not needed anymore.
+
+ io.c |    5 -----
+ 1 file changed, 5 deletions(-)
+diff -ruNp 9190-remove-block-dump.patch-old/kernel/power/io.c 9190-remove-block-dump.patch-new/kernel/power/io.c
+--- 9190-remove-block-dump.patch-old/kernel/power/io.c	2006-01-10 13:19:40.000000000 +1000
++++ 9190-remove-block-dump.patch-new/kernel/power/io.c	2006-01-10 13:04:01.000000000 +1000
+@@ -931,18 +931,13 @@ out_reset_console:
+  * Description:	Attempt to read the header and pageset1 of a suspend image.
+  * 		Handle the outcome, complaining where appropriate.
+  */
+-extern int block_dump;
+ 
+ int read_pageset1(void)
+ {
+ 	int error;
+ 
+-	block_dump = 1;
+-
+ 	error = __read_pageset1();
+ 
+-	block_dump = 0;
+-	
+ 	switch (error) {
+ 		case 0:
+ 		case -ENODATA:
+
+_______________________________________________
+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-rc16-swapwriter-selects-swap.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-swapwriter-selects-swap.patch
new file mode 100644
index 000000000000..d04bd9097b67
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-swapwriter-selects-swap.patch
@@ -0,0 +1,15 @@
+ Kconfig |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff -ruNp 9310-swapwriter-selects-swap.patch-old/kernel/power/Kconfig 9310-swapwriter-selects-swap.patch-new/kernel/power/Kconfig
+--- 9310-swapwriter-selects-swap.patch-old/kernel/power/Kconfig	2006-01-11 11:13:00.000000000 +1000
++++ 9310-swapwriter-selects-swap.patch-new/kernel/power/Kconfig	2006-01-11 11:10:57.000000000 +1000
+@@ -133,7 +133,8 @@ menuconfig SUSPEND2
+ 
+ 	config SUSPEND2_SWAPWRITER
+ 		bool '  Swap Writer'
+-		depends on SWAP && SUSPEND2
++		depends on SUSPEND2
++		select SWAP
+ 		---help---
+ 		  This option enables support for storing an image in your
+ 		  swap space.
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-post-suspend2.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-post-suspend2.patch
new file mode 100644
index 000000000000..b7f1958fbf78
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-post-suspend2.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.15.y.orig/kernel/workqueue.c.orig	2006-01-11 23:38:58.000000000 +0100
++++ linux-2.6.15.y/kernel/workqueue.c	2006-01-11 23:40:07.000000000 +0100
+@@ -335,7 +335,7 @@ struct workqueue_struct *__create_workqu
+ 	lock_cpu_hotplug();
+ 	if (singlethread) {
+ 		INIT_LIST_HEAD(&wq->list);
+-		p = create_workqueue_thread(wq, any_online_cpu(cpu_online_map),
++		p = create_workqueue_thread(wq, singlethread_cpu,
+ 				freezer_flags);
+ 		if (!p)
+ 			destroy = 1;
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch
new file mode 100644
index 000000000000..5f14c6929fc8
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch
@@ -0,0 +1,12 @@
+Index: linux-2.6.15.y/kernel/workqueue.c
+===================================================================
+--- linux-2.6.15.y.orig/kernel/workqueue.c.orig
++++ linux-2.6.15.y/kernel/workqueue.c
+@@ -335,6 +335,6 @@ struct workqueue_struct *__create_workqu
+ 	lock_cpu_hotplug();
+ 	if (singlethread) {
+ 		INIT_LIST_HEAD(&wq->list);
+-		p = create_workqueue_thread(wq, singlethread_cpu);
++		p = create_workqueue_thread(wq, any_online_cpu(cpu_online_map));
+ 		if (!p)
+ 			destroy = 1;
diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild
new file mode 100644
index 000000000000..2b5f00ecb5fe
--- /dev/null
+++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 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.15-r1.ebuild,v 1.1 2006/01/11 23:37:01 brix Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="2"
+
+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-rc16"
+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="${FILESDIR}/suspend2-2.2-rc16-workqueue-pre-suspend2.patch
+${DISTDIR}/${SUSPEND2_SRC}.tar.bz2
+${FILESDIR}/suspend2-2.2-rc16-amd64-is-ram.patch
+${FILESDIR}/suspend2-2.2-rc16-debug-rodata-define.patch
+${FILESDIR}/suspend2-2.2-rc16-remove-block-dump.patch
+${FILESDIR}/suspend2-2.2-rc16-swapwriter-selects-swap.patch
+${FILESDIR}/suspend2-2.2-rc16-workqueue-post-suspend2.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
+}