Mailinglist Archive: opensuse-commit (1670 mails)

Hello community,

here is the log from the commit of package suspend
checked in at Thu Oct 12 15:24:08 CEST 2006.

--------
--- arch/i386/suspend/suspend.changes 2006-09-29 20:33:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/suspend/suspend.changes 2006-10-12 15:08:54.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct 12 15:06:56 CEST 2006 - seife@xxxxxxx
+
+- update to current CVS:
+ - fix platform mode
+ - s2ram whitelist updates
+- use "maximum speed" options for liblzf
+
+-------------------------------------------------------------------

Old:
----
suspend-20060926.tar.bz2

New:
----
suspend-20061012.tar.bz2
suspend-liblzf-max-speed.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ suspend.spec ++++++
--- /var/tmp/diff_new_pack.aKKrym/_old 2006-10-12 15:23:58.000000000 +0200
+++ /var/tmp/diff_new_pack.aKKrym/_new 2006-10-12 15:23:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package suspend (Version 20060926)
+# spec file for package suspend (Version 20061012)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@

Name: suspend
BuildRequires: gnutls-devel pciutils-devel
-Version: 20060926
-Release: 2
+Version: 20061012
+Release: 1
Summary: A Set Of Tools To Support Sleep Modes
License: GPL
URL: http://sourceforge.net/projects/suspend
@@ -22,9 +22,10 @@
Source1: liblzf-1.6.tar.gz
Source2: openSUSE-factory-README.txt
Source3: README.scripts
-Patch0: suspend-install-fix.diff
-Patch1: suspend-susescripts.diff
-Patch2: suspend-comment-configfile-options.diff
+Patch0: suspend-liblzf-max-speed.diff
+Patch1: suspend-install-fix.diff
+Patch2: suspend-susescripts.diff
+Patch3: suspend-comment-configfile-options.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Supplements: powersave

@@ -45,6 +46,7 @@
%patch0 -p0
%patch1 -p0
%patch2 -p0
+%patch3 -p0
cp %{S:2} .
cp %{S:3} scripts/

@@ -84,6 +86,11 @@
%doc doc/installation-on-SUSE-10.1.txt openSUSE-factory-README.txt scripts/

%changelog -n suspend
+* Thu Oct 12 2006 - seife@xxxxxxx
+- update to current CVS:
+- fix platform mode
+- s2ram whitelist updates
+- use "maximum speed" options for liblzf
* Fri Sep 29 2006 - seife@xxxxxxx
- enable image-encryption.
* Tue Sep 26 2006 - seife@xxxxxxx

++++++ suspend-20060926.tar.bz2 -> suspend-20061012.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-20060926/HOWTO new/suspend-20061012/HOWTO
--- old/suspend-20060926/HOWTO 2006-09-24 10:09:59.000000000 +0200
+++ new/suspend-20061012/HOWTO 2006-09-28 14:32:10.000000000 +0200
@@ -247,6 +247,7 @@
max loglevel = <ignored>
early writeout = <y/n>
splash = <y/n>
+shutdown method = <reboot, platform>

The "image size" parameter may be used to limit the size of the system
snapshot image created by the s2disk tool, but it's not mandatory. Namely,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-20060926/resume.c new/suspend-20061012/resume.c
--- old/suspend-20060926/resume.c 2006-09-24 10:09:59.000000000 +0200
+++ new/suspend-20061012/resume.c 2006-10-11 23:17:48.000000000 +0200
@@ -758,7 +758,7 @@
while (stat(resume_dev_name, &stat_buf)) {
fprintf(stderr,
"resume: Could not stat the resume device file.\n"
- "\tPlease type in the file name to try again"
+ "\tPlease type in the full path name to try again\n"
"\tor press ENTER to boot the system: ");
fgets(resume_dev_name, MAX_STR_LEN - 1, stdin);
n = strlen(resume_dev_name) - 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-20060926/suspend.c new/suspend-20061012/suspend.c
--- old/suspend-20060926/suspend.c 2006-09-26 14:30:33.000000000 +0200
+++ new/suspend-20061012/suspend.c 2006-10-06 16:28:31.000000000 +0200
@@ -688,7 +688,7 @@
image_size = pref_image_size;
else
image_size = avail_swap;
- if (!image_size) {
+ if (!avail_swap) {
fprintf(stderr, "suspend: No swap space for suspend\n");
return ENOSPC;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-20060926/swsusp.h new/suspend-20061012/swsusp.h
--- old/suspend-20060926/swsusp.h 2006-09-26 14:30:33.000000000 +0200
+++ new/suspend-20061012/swsusp.h 2006-10-12 14:54:27.000000000 +0200
@@ -106,12 +106,12 @@

static inline int platform_prepare(int dev)
{
- return ioctl(dev, SNAPSHOT_PMOPS, PMOPS_FINISH);
+ return ioctl(dev, SNAPSHOT_PMOPS, PMOPS_PREPARE);
}

static inline int platform_enter(int dev)
{
- return ioctl(dev, SNAPSHOT_PMOPS, PMOPS_FINISH);
+ return ioctl(dev, SNAPSHOT_PMOPS, PMOPS_ENTER);
}

static inline int platform_finish(int dev)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-20060926/vbetool/vbetool.c new/suspend-20061012/vbetool/vbetool.c
--- old/suspend-20060926/vbetool/vbetool.c 2006-07-20 10:42:06.000000000 +0200
+++ new/suspend-20061012/vbetool/vbetool.c 2006-10-06 17:23:37.000000000 +0200
@@ -169,7 +169,7 @@
}

if (!function_sup) {
- fprintf(stderr, "Function not supported\n");
+ fprintf(stderr, "Function not supported?\n");
return -3;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-20060926/whitelist.c new/suspend-20061012/whitelist.c
--- old/suspend-20060926/whitelist.c 2006-09-21 12:37:43.000000000 +0200
+++ new/suspend-20061012/whitelist.c 2006-10-12 11:59:51.000000000 +0200
@@ -59,13 +59,20 @@
/* Andreas Schmitz */
{ "BenQ ", "Joybook R22", "", "", S3_BIOS|S3_MODE },
{ "Compaq", "Armada E500 *", "", "", 0 },
+ /* Chris AtLee <chris@xxxxxxxx>, VBE_MODE does not work, text size changes. */
+ { "Compaq ", "Evo N800wÂ *", "", "", VBE_POST|VBE_SAVE },
{ "Compaq", "N620cÂ *", "", "", S3_BIOS|S3_MODE },
+ /* Dell Inspiron 500m, Per Ãyvind Karlsen <pkarlsen@xxxxxxxxxxxx> */
+ { "Dell Computer Corporation", "Inspiron 500m*", "", "", S3_BIOS },
+ /* Eric Sandall <eric@xxxxxxxxxx> */
+ { "Dell Computer Corporation", "Inspiron 5100 *", "", "", NOFB },
/* VBE_POST|VBE_SAVE works on text console, but not under X. Tested by Chirag Rajyaguru */
{ "Dell Computer Corporation", "Inspiron 5150*", "", "", VBE_SAVE },
{ "Dell Computer Corporation", "Inspiron 8000 *", "", "", VBE_POST|VBE_SAVE },
/* by Henare Degan <henare.degan@xxxxxxxxx> 8500 w. NVidia card. There are also 8500s w. ATI cards */
- { "Dell Computer Corporation", "Inspiron 8500 *", "", "", 0 },
+ { "Dell Computer Corporation", "Inspiron 8500 *", "", "", VBE_POST|VBE_SAVE },
{ "Dell Computer Corporation", "Latitude C600 *", "", "", RADEON_OFF },
+ { "Dell Computer Corporation", "Latitude C610 *", "", "", VBE_POST|VBE_MODE },
{ "Dell Inc.", "Latitude D410 *", "", "", VBE_POST|VBE_SAVE },
{ "Dell Computer Corporation", "Latitude D600 *", "", "", VBE_POST|VBE_SAVE|NOFB },
{ "Dell Inc.", "Latitude D610 *", "", "", VBE_POST|VBE_SAVE|NOFB },
@@ -78,14 +85,18 @@
{ "Dell Inc.", "ME051 *", "", "", 0 },
/* Dell Inspiron 630m, Fredrik Edemar */
{ "Dell Inc.", "MXC051 *", "", "", 0 },
- /* Dell Inspiron 500m, Per Ãyvind Karlsen <pkarlsen@xxxxxxxxxxxx> */
- { "Dell Computer Corporation", "Inspiron 500m*", "", "", S3_BIOS },
+ /* Dell Inspiron 640m, Daniel Drake <dsd@xxxxxxxxxx> */
+ { "Dell Inc.", "MXC061 *", "", "", VBE_POST },
+ /* Per Ãyvind Karlsen <pkarlsen@xxxxxxxxxxxx> VBE_POST will get console working, but break X */
+ { "Dell Computer Corporation", "Precision M60*", "", "", VBE_SAVE },
/* Andi Kleen, reported to work in 64bit mode */
{ "FUJITSU", "LifeBook S2110", "", "", S3_BIOS },
/* Those two x86_64 amilos are a bit strange. I seldom see s3_bios + vbe_* ... */
{ "FUJITSU SIEMENS", "Amilo A7640 ", "", "", VBE_POST|VBE_SAVE|S3_BIOS },
/* reported by Thomas Halva Labella <hlabella@xxxxxxxxx> */
{ "FUJITSU SIEMENS", "Amilo A7645 ", "", "", VBE_SAVE|S3_BIOS|S3_MODE },
+ /* <jan.lockenvitz.ext@xxxxxxxxxxx>, tested with X only */
+ { "FUJITSU SIEMENS", "LIFEBOOK S7010", "", "", 0 },
{ "FUJITSU SIEMENS", "Stylistic ST5000", "", "", S3_BIOS|S3_MODE },
/* This is a desktop with onboard i810 video */
{ "FUJITSU SIEMENS", "SCENIC W300/W600", "", "", VBE_POST|VBE_SAVE },
@@ -95,7 +106,7 @@
{ "Hewlett-Packard", "HP Compaq nx6125 *", "", "", VBE_SAVE|NOFB },
{ "Hewlett-Packard", "HP Compaq nc6230 *", "", "", VBE_SAVE|NOFB },
/* Michael Biebl <biebl@xxxxxxxx> */
- { "Hewlett-Packard", "HP Compaq nx7000 *", "", "", VBE_POST|VBE_SAVE },
+ { "Hewlett-Packard ", "HP compaq nx7000 *", "", "", VBE_POST|VBE_SAVE },
{ "Hewlett-Packard", "HP Compaq nx8220 *", "", "", VBE_SAVE|NOFB },
/* Arthur Peters <amp@xxxxxxxxxxxxxxxxx> */
{ "Hewlett-Packard", "Presario R3200 *", "", "", VBE_POST|VBE_SAVE },
@@ -117,7 +128,8 @@
{ "IBM", "2373*", "", "", S3_BIOS|S3_MODE },
/* T41p, Stefan Gerber */
{ "IBM", "2374*", "", "", S3_BIOS|S3_MODE },
- { "IBM", "2668*", "ThinkPad T43", "", S3_BIOS|S3_MODE },
+ /* Some T43's reported by Sebastian Nagel */
+ { "IBM", "", "ThinkPad T43", "", S3_BIOS|S3_MODE },
/* G40 confirmed by David H"ademan */
{ "IBM", "2388*", "", "", VBE_SAVE },
/* R32 */
@@ -133,16 +145,18 @@
{ "LENOVO", "1702*", "", "", S3_BIOS|S3_MODE },
{ "LENOVO", "1704*", "", "", S3_BIOS|S3_MODE },
{ "LENOVO", "1706*", "", "", S3_BIOS|S3_MODE },
+ /* https://bugzilla.novell.com/show_bug.cgi?id=210928, note the small "p" in Thinkpad */
+ { "LENOVO", "", "Thinkpad R60", "", S3_BIOS },
/* At least 1709 series thinkpads can be whitelisted by name,
and we can probably delete entries above, too.... */
{ "LENOVO", "", "ThinkPad X60", "", S3_BIOS|S3_MODE },
- /* T60p */
- { "LENOVO", "2007*", "", "", S3_BIOS|S3_MODE },
- /* T60 From: Jeff Nichols <jnichols@xxxxxxxxxx> */
- { "LENOVO", "", "ThinkPad T60", "", S3_BIOS|S3_MODE },
+ /* T60p, had a report from a 2007* and a 2008* model */
+ { "LENOVO", "", "ThinkPad T60p", "", S3_BIOS|S3_MODE },
+ /* T60 From: Jeff Nichols <jnichols@xxxxxxxxxx> and Kristofer Hallgren <kristofer.hallgren@xxxxxxxxx> */
+ { "LENOVO", "", "ThinkPad T60", "", S3_BIOS|S3_MODE },

{ "LG Electronics", "M1-3DGBG", "", "", S3_BIOS|S3_MODE },
- { "Matsushita Electric Industrial Co.,Ltd.", "CF-51E*", "", "", VBE_POST|VBE_SAVE },
+ { "Matsushita Electric Industrial Co.,Ltd.", "CF-51E*", "", "", VBE_POST|VBE_MODE },
/* Hugo Costelha */
{ "NEC *", "B7 *", "", "", VBE_SAVE },
{ "TOSHIBA", "Libretto L5/TNK", "", "", 0 },
@@ -154,10 +168,14 @@
/* Michaell Gurski */
{ "TOSHIBA", "Satellite M35X", "", "", S3_BIOS|S3_MODE },
{ "TOSHIBA", "TECRA S3", "", "", 0 },
+ /* Stefan Seyfried has one of those :-) S3_BIOS leads to "melting screen" */
+ { "TOSHIBA", "TECRA 8200", "", "", S3_MODE },
{ "Samsung", "SQ10", "", "", VBE_POST|VBE_SAVE },
{ "Samsung Electronics", "SX20S", "", "", S3_BIOS|S3_MODE },
{ "SHARP ", "PC-AR10 *", "", "", 0 },
{ "Sony Corporation", "VGN-FS115B", "", "", S3_BIOS|S3_MODE },
+ /* Olivier Saier <osaier@xxxxxxxxx>, apparently S3_BIOS locks the machine hard */
+ { "Sony Corporation", "VGN-FS115Z", "", "", S3_MODE },
/* Joseph Smith <joe@xxxxxxxxxxxxxxx> */
{ "Sony Corporation", "VGN-FS660_W", "", "", 0 },
{ "Sony Corporation", "PCG-GRT995MP*", "", "", 0 },
@@ -269,7 +287,6 @@
{ "IBM", "1876*", "", "", VBE_POST|VBE_SAVE|UNSURE },
// T43/p
{ "IBM", "2668*", "", "", VBE_POST|VBE_SAVE|UNSURE },
- { "IBM", "2669*", "", "", VBE_POST|VBE_SAVE|UNSURE },
{ "IBM", "2678*", "", "", VBE_POST|VBE_SAVE|UNSURE },
{ "IBM", "2679*", "", "", VBE_POST|VBE_SAVE|UNSURE },
{ "IBM", "2686*", "", "", VBE_POST|VBE_SAVE|UNSURE },

++++++ suspend-liblzf-max-speed.diff ++++++
--- liblzf-1.6/lzfP.h
+++ liblzf-1.6/lzfP.h
@@ -54,7 +54,7 @@
* For best compression, use 15 or 16 (or more).
*/
#ifndef HLOG
-# define HLOG 15
+# define HLOG 13
#endif

/*
@@ -75,7 +75,7 @@
* possibly disable this for text data.
*/
#ifndef ULTRA_FAST
-# define ULTRA_FAST 0
+# define ULTRA_FAST 1
#endif

/*

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1670 mails)

commit suspend

Search this list

List Navigation

This Thread