MD5 36b9f4b863ed2502c5a6947df920c318 suspend2-sources-2.6.13-r4.ebuild 1973
MD5 f23ae998b29e9b8c89629a960daf7bf8 suspend2-sources-2.6.13-r1.ebuild 2013
MD5 6390d140bb44f262eb10401c6de55326 suspend2-sources-2.6.13.ebuild 2070
+MD5 45de525f3fc3f9637371cae09f933a1c suspend2-sources-2.6.14-r5.ebuild 1816
MD5 87f85d43a2586902805f98101306cdb3 suspend2-sources-2.6.13-r3.ebuild 1974
MD5 509af92e8b755497d58fa8a7c241e4f5 suspend2-sources-2.6.13-r5.ebuild 1974
MD5 8568b2e77968c390752e1bddc8005885 suspend2-sources-2.6.14-r4.ebuild 1769
MD5 b2b02e62be94dd09f2b39fcfb91800d0 suspend2-sources-2.6.13-r2.ebuild 1974
-MD5 53d375dde09e38c0078acff1fd6d0cb7 ChangeLog 5117
+MD5 9dc4d8907ad71f75aaf69bce91a7fac5 ChangeLog 5340
MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275
MD5 0ac91b574db18e623878d358a1e1c9e7 suspend2-sources-2.6.14.ebuild 1765
MD5 8c885e50de95004ba759a137c3f93495 files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch 877
+MD5 4c9a2a6532217c3e54a52f6633e33c9f files/suspend2-2.2-rc13-filewriter.patch 5283
MD5 5ff92c313009119044ed51956fb509f9 files/digest-suspend2-sources-2.6.13-r1 310
MD5 16d093ac8154cc561af7a4a90179d885 files/digest-suspend2-sources-2.6.13-r2 310
MD5 63ce46eba91fa8e586a2a26ed6432987 files/digest-suspend2-sources-2.6.13-r3 310
MD5 a1ecfa4588d9177bc680ebe3acf020b9 files/digest-suspend2-sources-2.6.13-r4 310
MD5 906ae7417b7d3ae2f2bf7859812f8396 files/digest-suspend2-sources-2.6.13-r5 310
MD5 92ba5acc4df4d19ceaa8d998eb57738d files/digest-suspend2-sources-2.6.14-r4 303
+MD5 92ba5acc4df4d19ceaa8d998eb57738d files/digest-suspend2-sources-2.6.14-r5 303
MD5 d1eff82a3bab3c5b67dec45a552888e4 files/linux-2.6.13-poweroff.patch 500
MD5 a67db8b8f894652b4d1456406d307a37 files/digest-suspend2-sources-2.6.13 310
MD5 ae95e997f0e9496adfb824ee7f166c5d files/digest-suspend2-sources-2.6.14 301
--- /dev/null
+diff -ruNp 9770-filewriter.patch-old/kernel/power/io.c 9770-filewriter.patch-new/kernel/power/io.c
+--- 9770-filewriter.patch-old/kernel/power/io.c 2005-11-26 00:09:09.000000000 +1100
++++ 9770-filewriter.patch-new/kernel/power/io.c 2005-11-26 00:07:52.000000000 +1100
+@@ -690,11 +690,9 @@ int write_image_header(void)
+ }
+
+ /* Write suspend header */
+- printk("Writing image header.\n");
+ fill_suspend_header((struct suspend_header *) header_buffer);
+ active_writer->ops.writer.write_header_chunk(header_buffer,
+ sizeof(struct suspend_header));
+- printk("Done.\n");
+
+ free_page((unsigned long) header_buffer);
+
+diff -ruNp 9770-filewriter.patch-old/kernel/power/suspend_file.c 9770-filewriter.patch-new/kernel/power/suspend_file.c
+--- 9770-filewriter.patch-old/kernel/power/suspend_file.c 2005-11-26 00:09:09.000000000 +1100
++++ 9770-filewriter.patch-new/kernel/power/suspend_file.c 2005-11-26 00:02:36.000000000 +1100
+@@ -300,7 +300,8 @@ static void filewriter_cleanup(int finis
+ }
+ }
+
+-static void filewriter_get_target_info(char *target, int get_size)
++static void filewriter_get_target_info(char *target, int get_size,
++ int resume2)
+ {
+ if (target_file)
+ filewriter_cleanup(0);
+@@ -310,7 +311,7 @@ static void filewriter_get_target_info(c
+
+ target_file = filp_open(target, O_RDWR, 0);
+
+- if (target_file <= 0) {
++ if (IS_ERR(target_file) || !target_file) {
+ printk("Open file %s returned %p.\n", target, target_file);
+ target_file = NULL;
+ return;
+@@ -333,10 +334,11 @@ static void filewriter_get_target_info(c
+ } else
+ target_bdev = target_inode->i_sb->s_bdev;
+
+- target_firstblock = bmap(target_inode, 0);
+-
+ get_target_info(get_size);
+
++ if (!resume2)
++ target_firstblock = bmap(target_inode, 0) << target_bmap_shift;
++
+ return;
+ cleanup:
+ target_inode = NULL;
+@@ -672,13 +674,13 @@ static int filewriter_write_header_clean
+
+ /* Adjust image header */
+ suspend_bio_ops.bdev_page_io(READ, target_bdev,
+- target_firstblock << target_bmap_shift,
++ target_firstblock,
+ virt_to_page(filewriter_buffer));
+
+ prepare_signature(first_header_submit_info, filewriter_buffer);
+
+ suspend_bio_ops.bdev_page_io(WRITE, target_bdev,
+- target_firstblock << target_bmap_shift,
++ target_firstblock,
+ virt_to_page(filewriter_buffer));
+
+ free_page((unsigned long) filewriter_buffer);
+@@ -736,13 +738,12 @@ static int file_init(void)
+
+ /* Read filewriter configuration */
+ suspend_bio_ops.bdev_page_io(READ, target_bdev,
+- target_firstblock << target_bmap_shift,
++ target_firstblock,
+ virt_to_page((unsigned long) filewriter_buffer));
+
+ suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0,
+- "Retrieving %d bytes from %x:%x to page %d, %p-%p.\n",
++ "Retrieving from %x:%x to page %d, %p-%p.\n",
+ target_bdev->bd_dev, target_firstblock,
+- sizeof(filewriter_header_data),
+ filewriter_page_index,
+ filewriter_buffer, filewriter_buffer + sizeof(filewriter_header_data) - 1);
+
+@@ -826,17 +827,9 @@ static int filewriter_read_header_chunk(
+ suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0,
+ "Reading header page %d. ",
+ filewriter_page_index);
+- suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0,
+- "Dev is %x. Block is %lu. Blocksperpage is %d. ",
+- target_bdev,
+- next,
+- target_blocksperpage);
+- suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0,
+- "Bd_block_size is %d.\n",
+- target_bdev->bd_block_size);
+
+ suspend_bio_ops.bdev_page_io(READ, target_bdev,
+- next << target_bmap_shift,
++ next,
+ virt_to_page(filewriter_buffer));
+ }
+
+@@ -1088,7 +1081,7 @@ static int filewriter_signature_op(int o
+ }
+
+ suspend_bio_ops.bdev_page_io(READ, target_bdev,
+- target_firstblock << target_bmap_shift,
++ target_firstblock,
+ virt_to_page(cur));
+
+ result = parse_signature(cur);
+@@ -1112,7 +1105,7 @@ static int filewriter_signature_op(int o
+
+ if (changed)
+ suspend_bio_ops.bdev_page_io(WRITE, target_bdev,
+- target_firstblock << target_bmap_shift,
++ target_firstblock,
+ virt_to_page(cur));
+
+ out:
+@@ -1282,7 +1275,7 @@ static int filewriter_parse_sig_location
+ }
+ }
+
+- filewriter_get_target_info(commandline, 0);
++ filewriter_get_target_info(commandline, 0, 1);
+
+ if (colon)
+ *colon = ':';
+@@ -1333,7 +1326,7 @@ static void filewriter_set_resume2(void)
+
+ if (sector)
+ offset += snprintf(buffer + offset, PAGE_SIZE - offset,
+- ":0x%lx", sector);
++ ":0x%lx", sector << target_bmap_shift);
+ } else
+ offset += snprintf(buffer + offset, PAGE_SIZE - offset,
+ "%s is not a valid target.", filewriter_target);
+@@ -1373,7 +1366,7 @@ static void filewriter_load_config_info(
+
+ static void test_filewriter_target(void)
+ {
+- filewriter_get_target_info(filewriter_target, 0);
++ filewriter_get_target_info(filewriter_target, 0, 0);
+ if (filewriter_signature_op(GET_IMAGE_EXISTS) > -1) {
+ printk(name_suspend "Filewriter: File signature found.\n");
+ filewriter_set_resume2();
+@@ -1403,7 +1396,7 @@ static int filewriter_initialise(int sta
+ }
+
+ if (filewriter_target)
+- filewriter_get_target_info(filewriter_target, starting_cycle);
++ filewriter_get_target_info(filewriter_target, starting_cycle, 0);
+
+ if (starting_cycle && (filewriter_image_exists() == -1)) {
+ printk("%s is does not have a valid signature for suspending.\n",
--- /dev/null
+# 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-r5.ebuild,v 1.1 2005/11/26 14:32:33 brix Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="4"
+
+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-rc13"
+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-rc13-filewriter.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-devel mailing list:
+http://lists.suspend2.net/cgi-bin/mailman/listinfo/suspend2-devel"
+
+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
+}
projects / gentoo.git / commitdiff