commit suspend

31 Jul 2007

Hello community,

here is the log from the commit of package suspend
checked in at Tue Jul 31 15:06:40 CEST 2007.

--------

--- arch/i386/suspend/suspend.changes	2007-07-30 14:23:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/suspend/suspend.changes	2007-07-31 14:37:42.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Jul 31 14:36:59 CEST 2007 - seife@suse.de
+
+- update to current cvs:
+  - whitelist updates
+  - fix acpi_video_mode setting, was not effective before
+
+-------------------------------------------------------------------
+Tue Jul 31 12:13:50 CEST 2007 - seife@suse.de
+
+- correct the Aspire 1690 whitelist entry (novell bug 293662)
+- fix build with old "make" (SLED10)
+
+-------------------------------------------------------------------

Old:
----
  suspend-0.50.20070730.tar.bz2

New:
----
  suspend-0.50.20070730-makefile-old-make-fix.diff
  suspend-0.50.20070731.tar.bz2

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

Other differences:
------------------
++++++ suspend.spec ++++++
--- /var/tmp/diff_new_pack.c23469/_old	2007-07-31 15:05:15.000000000 +0200
+++ /var/tmp/diff_new_pack.c23469/_new	2007-07-31 15:05:15.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package suspend (Version 0.50.20070730)
+# spec file for package suspend (Version 0.50.20070731)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
 
 Name:           suspend
 BuildRequires:  gnutls-devel libx86-devel pciutils-devel splashy-devel
-Version:        0.50.20070730
+Version:        0.50.20070731
 Release:        1
 Summary:        A Set Of Tools To Support Sleep Modes
 License:        GPL v2 or later
@@ -27,6 +27,7 @@
 Patch3:         suspend-default-compress.diff
 Patch4:         suspend-disable-bootsplash.diff
 Patch5:         suspend-s2ram-suspend-fbcon.diff
+Patch6:         suspend-0.50.20070730-makefile-old-make-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 Supplements:    powersave
@@ -52,6 +53,7 @@
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
+%patch6 -p0
 cp %{S:3} scripts/
 #cp -vb --suffix=-0.5 %{S:99} whitelist.c
 
@@ -99,6 +101,13 @@
 %doc doc/installation-on-SUSE-10.1.txt scripts/
 
 %changelog
+* Tue Jul 31 2007 - seife@suse.de
+- update to current cvs:
+  - whitelist updates
+  - fix acpi_video_mode setting, was not effective before
+* Tue Jul 31 2007 - seife@suse.de
+- correct the Aspire 1690 whitelist entry (novell bug 293662)
+- fix build with old "make" (SLED10)
 * Mon Jul 30 2007 - seife@suse.de
 - update to current cvs:
   - whitelist updates


++++++ suspend-0.50.20070730-makefile-old-make-fix.diff ++++++
--- Makefile
+++ Makefile
@@ -31,7 +31,8 @@
 ifeq ($(ARCH), x86)
 S2RAM_OBJ += s2ram-x86.o dmidecode.o radeontool.o vbetool/vbetool.o
 S2RAM_LD_FLAGS += -lx86 -lpci -lz
-else ifeq ($(ARCH), ppc)
+endif
+ifeq ($(ARCH), ppc)
 S2RAM_OBJ += s2ram-ppc.o
 endif
 
++++++ suspend-0.50.20070730.tar.bz2 -> suspend-0.50.20070731.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.50.20070730/s2ram-x86.c new/suspend-0.50.20070731/s2ram-x86.c
--- old/suspend-0.50.20070730/s2ram-x86.c	2007-07-19 15:28:47.000000000 +0200
+++ new/suspend-0.50.20070731/s2ram-x86.c	2007-07-31 14:32:41.000000000 +0200
@@ -71,7 +71,7 @@
 static int set_acpi_video_mode(int mode)
 {
 	unsigned long acpi_video_flags;
-	FILE *f = fopen("/proc/sys/kernel/acpi_video_flags", "rw");
+	FILE *f = fopen("/proc/sys/kernel/acpi_video_flags", "r");
 	if (!f) {
 		printf("/proc/sys/kernel/acpi_video_flags does not exist; you need a kernel >=2.6.16.\n");
 		return S2RAM_FAIL;
@@ -81,6 +81,9 @@
 		printf("/proc/sys/kernel/acpi_video_flags format is invalid\n");
 		return S2RAM_FAIL;
 	}
+	/* rewind() seems not to work on /proc files, so close and reopen it */
+	fclose(f);
+	f = fopen("/proc/sys/kernel/acpi_video_flags", "w");
 	/* mask out bits 0 and 1 */
 	acpi_video_flags = acpi_video_flags & (~0UL - S3_BIOS - S3_MODE);
 	fprintf(f, "%ld", acpi_video_flags | mode);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.50.20070730/whitelist.c new/suspend-0.50.20070731/whitelist.c
--- old/suspend-0.50.20070730/whitelist.c	2007-07-30 11:57:05.000000000 +0200
+++ new/suspend-0.50.20070731/whitelist.c	2007-07-31 14:35:05.000000000 +0200
@@ -264,7 +264,9 @@
 	/* hp compaq nc2400, tested by seife. sometimes has keyboard problems after resume */
 	{ "Hewlett-Packard",		"HP Compaq nc2400*",	"",	"68YOP*", VBE_POST|VBE_MODE },
 	/* Rene Seindal <rene@seindal.dk> */
-	{ "Hewlett-Packard",		"HP Compaq nc4400*",	"",	"68YHV*", VBE_POST|VBE_SAVE },
+	{ "Hewlett-Packard",		"HP Compaq nc4400*",	"F.08",	"68YHV*", VBE_POST|VBE_SAVE },
+	/* Antti Laine <antti.a.laine@tut.fi>, "did not work with older BIOS", now has F.09 */
+	{ "Hewlett-Packard",		"HP Compaq nc4400*",	"",	"68YHV*", VBE_POST|VBE_MODE },
 	{ "Hewlett-Packard*",		"Compaq nx5000 *",	"",	"68BCU*", VBE_POST|VBE_MODE },
 	{ "Hewlett-Packard*",		"hp compaq nx5000 *",	"",	"68BCU*", VBE_POST|VBE_MODE },
 	/* Ed Hoo <whoishoo@gmail.com> */
@@ -294,6 +296,8 @@
 	/* Michael Meskes <meskes@debian.org>, this is a NX 7400 */
 	{ "Hewlett-Packard",		"",			"",	"68YGU*", VBE_POST },
 	{ "Hewlett-Packard",		"HP Compaq nx8220 *",	"",	"", VBE_SAVE|NOFB },
+	/* Stefan Seyfried <seife@suse.de> novell bug 259831 */
+	{ "Hewlett-Packard",	"HP Compaq nw8440 (EY696AA*",	"",	"68YVD*", VBE_POST|VBE_MODE },
 	/* Matto Marjanovic <maddog@mir.com> */
 	{ "Hewlett-Packard",		"Presario C500 (RZ341UA#*",	"",	"", 0 },
 	/* Fatih Alabas https://bugzilla.novell.com/show_bug.cgi?id=230528 */
@@ -475,6 +479,8 @@
 	{ "TOSHIBA",			"Satellite M35X",	"",	"", S3_BIOS|S3_MODE },
 	/* Antonis Tsolomitis <atsol@aegean.gr> */
 	{ "TOSHIBA",			"Satellite P10",	"",	"", S3_BIOS|NOFB },
+	/* From: mire <mire@osadmin.com> */
+	{ "TOSHIBA",			"Satellite P200",	"",	"", S3_BIOS|S3_MODE },
 	/* From: Jim <jim.t@vertigo.net.au> */
 	{ "TOSHIBA",			"SatellitePro4600",	"",	"", 0 },
 	/* Bram Senders <bram@luon.net> */

++++++ suspend-s2ram-suspend-fbcon.diff ++++++
--- /var/tmp/diff_new_pack.c23469/_old	2007-07-31 15:05:16.000000000 +0200
+++ /var/tmp/diff_new_pack.c23469/_new	2007-07-31 15:05:16.000000000 +0200
@@ -4,7 +4,7 @@
 retrieving revision 1.6
 diff -u -p -r1.6 s2ram-x86.c
 --- s2ram-x86.c	19 Jul 2007 13:28:47 -0000	1.6
-+++ s2ram-x86.c	30 Jul 2007 09:41:21 -0000
++++ s2ram-x86.c	31 Jul 2007 10:11:29 -0000
 @@ -10,6 +10,9 @@
  #include <stdlib.h>
  #include <errno.h>
@@ -74,3 +74,19 @@
  	if (flags & RADEON_OFF) {
  		printf("Calling radeon_cmd_light(1)\n");
  		radeon_cmd_light(1);
+Index: whitelist.c
+===================================================================
+RCS file: /cvsroot/suspend/suspend/whitelist.c,v
+retrieving revision 1.106
+diff -u -p -r1.106 whitelist.c
+--- whitelist.c	30 Jul 2007 09:57:05 -0000	1.106
++++ whitelist.c	31 Jul 2007 10:11:29 -0000
+@@ -25,7 +25,7 @@ struct machine_entry whitelist[] = {
+ 	{ "Apple Computer, Inc.",	"MacBookPro2,2",	"",	"", VBE_POST|VBE_MODE },
+ 	/* Felix Rommel, https://bugzilla.novell.com/show_bug.cgi?id=228572 */
+ 	{ "Acer,Inc.",			"Aspire 1350",		"",	"", VBE_POST|VBE_MODE|NOFB },
+-	{ "Acer, inc.",			"Aspire 1690     ",	"",	"", VBE_POST|VBE_SAVE|NOFB },
++	{ "Acer, inc.",			"Aspire 1690     ",	"",	"", VBE_POST|VBE_SAVE },
+ 	/* Ricardo Garcia <sarbalap+freshmeat@gmail.com> */
+ 	{ "Acer, inc.",			"Aspire 3000 *",	"",	"", VBE_POST|VBE_MODE },
+ 	/* From: Bontemps Camille <camille.bontemps@gmail.com> */


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



Remember to have fun...

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

    

root＠Hilbert.suse.de

tags

participants (1)