Hello community,
here is the log from the commit of package suspend
checked in at Mon Apr 21 02:39:45 CEST 2008.
--------
--- arch/i386/suspend/suspend.changes 2008-02-25 23:46:18.000000000 +0100
+++ suspend/suspend.changes 2008-04-16 19:09:19.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 16 19:08:18 CEST 2008 - seife@suse.de
+
+- update to current CVS:
+ - huge whitelist update for s2ram
+ - libgcc_s fix is upstream
+ - minor cleanups in the build system
+ - specfile more buildservice-friendly
+
+-------------------------------------------------------------------
Old:
----
suspend-0.80-splashy-configurefix.diff
suspend-0.8.20080219.tar.bz2
suspend-build-with-gcc_s.diff
New:
----
suspend-0.80-make-whitelist-test.diff
suspend-0.8.20080416.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suspend.spec ++++++
--- /var/tmp/diff_new_pack.Q26957/_old 2008-04-21 02:38:42.000000000 +0200
+++ /var/tmp/diff_new_pack.Q26957/_new 2008-04-21 02:38:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package suspend (Version 0.80.20080219)
+# spec file for package suspend (Version 0.80.20080416)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,13 +12,21 @@
Name: suspend
-BuildRequires: glib2-devel gnutls-devel lzo-devel pciutils-devel pkgconfig splashy-devel
+BuildRequires: glib2-devel gnutls-devel pciutils-devel pkgconfig
+%if 0%{?suse_version} > 1020
+BuildRequires: splashy-devel
+%endif
+%if 0%{?mandriva_version}
+BuildRequires: liblzo-devel
+%else
+BuildRequires: lzo-devel
+%endif
%ifarch %ix86 x86_64
BuildRequires: libx86-devel
%endif
-Version: 0.80.20080219
-Release: 4
-%define tarversion 0.8.20080219
+Version: 0.80.20080416
+Release: 1
+%define tarversion 0.8.20080416
Summary: A Set Of Tools To Support Sleep Modes
License: GPL v2 or later
Url: http://sourceforge.net/projects/suspend
@@ -32,9 +40,8 @@
Patch5: suspend-default-splash.diff
Patch6: suspend-0.70-dont-return-eintr-on-abort.diff
Patch10: suspend-0.80-input.diff
-Patch11: suspend-0.80-splashy-configurefix.diff
+Patch11: suspend-0.80-make-whitelist-test.diff
Patch12: suspend-0.80-glib-linkeropts.diff
-Patch13: suspend-build-with-gcc_s.diff
Patch99: suspend-0.80-opensuse.org.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -64,7 +71,6 @@
%patch10 -p2
%patch11 -p0
%patch12 -p0
-%patch13 -p0
%patch99 -p1
cp %{S:3} scripts/
#cp -vb --suffix=-0.5 %{S:99} whitelist.c
@@ -74,12 +80,14 @@
# autoreconf -fi
./configure --prefix=/usr \
--sysconfdir=/etc \
- --docdir=/usr/share/doc/packages/suspend \
--with-initramfsdir=/usr/sbin \
--enable-compress \
--enable-encrypt \
+%if 0%{?suse_version} > 1020
--enable-splashy \
- --disable-resume-static
+ --disable-resume-static \
+%endif
+ --docdir=%{_docdir}/%{name}
make
%install
@@ -114,6 +122,12 @@
%endif
%changelog
+* Wed Apr 16 2008 seife@suse.de
+- update to current CVS:
+ - huge whitelist update for s2ram
+ - libgcc_s fix is upstream
+ - minor cleanups in the build system
+ - specfile more buildservice-friendly
* Tue Feb 26 2008 hmacht@suse.de
- add patch suspend-build-with-gcc_s.diff:
- this makes splashy actually work again
@@ -219,7 +233,7 @@
- unblank the console after resume from disk
- more space-efficient storage of encryption details in image
- various other small fixes
-* Mon Jan 22 2007 seife@suse.de
+* Tue Jan 23 2007 seife@suse.de
- update to current CVS, which has:
- all new s2ram option pci_save for machines that need PCI state
saving of the graphics card
@@ -243,7 +257,7 @@
- whitelist updates
- add "swap-offset" tool for using swapfiles to suspend
(not supported yet by the kernel and our initrd)
-* Thu Nov 09 2006 seife@suse.de
+* Fri Nov 10 2006 seife@suse.de
- fix blocker bug 219629, resume never resumed.
* Mon Nov 06 2006 seife@suse.de
- update to current CVS:
@@ -277,7 +291,7 @@
- timing for suspend and resume
- whitelist updates
- config file options are completely commented out now.
-* Wed Sep 20 2006 seife@suse.de
+* Thu Sep 21 2006 seife@suse.de
- update to current CVS which does:
- bootsplash fixes, alternative implementation (not used)
- Makefile reworked
++++++ suspend-0.80-make-whitelist-test.diff ++++++
Index: Makefile.am
===================================================================
RCS file: /cvsroot/suspend/suspend/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- Makefile.am 16 Apr 2008 15:27:36 -0000 1.6
+++ Makefile.am 16 Apr 2008 16:43:25 -0000
@@ -176,3 +176,9 @@ install-resume-new-initrd: resume
install-resume-on-initrd: resume
BOOT_DIR=$(DESTDIR)$(bootdir) ./scripts/install-resume.sh
+
+whitelist-test:
+ gcc -shared -o /dev/null -Werror -W -Wall whitelist.c
+
+all-local:
+ make whitelist-test
++++++ suspend-0.8.20080219.tar.bz2 -> suspend-0.8.20080416.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.8.20080219/config.h.in new/suspend-0.8.20080416/config.h.in
--- old/suspend-0.8.20080219/config.h.in 2008-02-19 16:36:09.000000000 +0100
+++ new/suspend-0.8.20080416/config.h.in 2008-04-16 18:46:52.000000000 +0200
@@ -27,6 +27,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `gcc_s' library (-lgcc_s). */
+#undef HAVE_LIBGCC_S
+
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.8.20080219/configure new/suspend-0.8.20080416/configure
--- old/suspend-0.8.20080219/configure 2008-02-19 16:35:56.000000000 +0100
+++ new/suspend-0.8.20080416/configure 2008-04-16 18:45:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for suspend 0.8.20080219.
+# Generated by GNU Autoconf 2.61 for suspend 0.8.20080416.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
# Identity of this package.
PACKAGE_NAME='suspend'
PACKAGE_TARNAME='suspend'
-PACKAGE_VERSION='0.8.20080219'
-PACKAGE_STRING='suspend 0.8.20080219'
+PACKAGE_VERSION='0.8.20080416'
+PACKAGE_STRING='suspend 0.8.20080416'
PACKAGE_BUGREPORT=''
ac_unique_file="suspend.c"
@@ -1439,7 +1439,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures suspend 0.8.20080219 to adapt to many kinds of systems.
+\`configure' configures suspend 0.8.20080416 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,24 +1509,24 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of suspend 0.8.20080219:";;
+ short | recursive ) echo "Configuration of suspend 0.8.20080416:";;
esac
cat <<\_ACEOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-debug Enable debug mode
- --enable-strict Enable strict compile mode
- --enable-pedantic Enable pedantic compile mode
- --enable-minimal Enable minimal build
- --enable-compress Enable compress support
- --enable-encrypt Enable encryption support
- --enable-create-device Enable create required devices, use only if you
+ --enable-debug enable debug mode
+ --enable-strict enable strict compile mode
+ --enable-pedantic enable pedantic compile mode
+ --enable-minimal enable minimal build
+ --enable-compress enable compress support
+ --enable-encrypt enable encryption support
+ --enable-create-device enable create required devices, use only if you
don't have udev
- --disable-resume-static Build resume as dynamic module
- --enable-splashy Enable splashy support
- --enable-fbsplash Enable fbsplash support
+ --disable-resume-static build resume as dynamic module
+ --enable-splashy enable splashy support
+ --enable-fbsplash enable fbsplash support
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-shared[=PKGS] build shared libraries [default=yes]
@@ -1539,18 +1539,18 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-devdir=DIR Use if --enable-create-device, put devices in this
+ --with-devdir=DIR use if --enable-create-device, put devices in this
directory, default /dev
- --with-initramfsdir=DIR Put initramfs binaries in this directory, default
+ --with-initramfsdir=DIR put initramfs binaries in this directory, default
LIBDIR/suspend
--with-libgcrypt-prefix=DIR
- Define libgcrypt prefix, default /usr
+ define libgcrypt prefix, default /usr
--with-directfb-prefix=DIR
- Define directfb prefix, default /usr
+ define directfb prefix, default /usr
--with-resume-device=DEVICE
- Define resume device (REQUIRED ONLY FOR BUILDING
+ define resume device (REQUIRED ONLY FOR BUILDING
INITRAMFS DURING MAKE)
- --with-bootdir=DIR Define boot directory, default /boot (REQUIRED ONLY
+ --with-bootdir=DIR define boot directory, default /boot (REQUIRED ONLY
FOR BUILDING INITRAMFS DURING MAKE)
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
@@ -1652,7 +1652,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-suspend configure 0.8.20080219
+suspend configure 0.8.20080416
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1666,7 +1666,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by suspend $as_me 0.8.20080219, which was
+It was created by suspend $as_me 0.8.20080416, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -21198,12 +21198,85 @@
_ACEOF
+ # Workaround a wierd splashy issue
+
+{ echo "$as_me:$LINENO: checking for strlen in -lgcc_s" >&5
+echo $ECHO_N "checking for strlen in -lgcc_s... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gcc_s_strlen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgcc_s $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strlen ();
+int
+main ()
+{
+return strlen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_gcc_s_strlen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gcc_s_strlen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gcc_s_strlen" >&5
+echo "${ECHO_T}$ac_cv_lib_gcc_s_strlen" >&6; }
+if test $ac_cv_lib_gcc_s_strlen = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGCC_S 1
+_ACEOF
+
+ LIBS="-lgcc_s $LIBS"
+
+fi
+
+
if test -z "${SPLASHY_LIBS}"; then
- { echo "$as_me:$LINENO: checking for splashy_open in -lsplashy" >&5
-echo $ECHO_N "checking for splashy_open in -lsplashy... $ECHO_C" >&6; }
-if test "${ac_cv_lib_splashy_splashy_open+set}" = set; then
+ { echo "$as_me:$LINENO: checking for splashy_init in -lsplashy" >&5
+echo $ECHO_N "checking for splashy_init in -lsplashy... $ECHO_C" >&6; }
+if test "${ac_cv_lib_splashy_splashy_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21221,11 +21294,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char splashy_open ();
+char splashy_init ();
int
main ()
{
-return splashy_open ();
+return splashy_init ();
;
return 0;
}
@@ -21248,21 +21321,21 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_splashy_splashy_open=yes
+ ac_cv_lib_splashy_splashy_init=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_splashy_splashy_open=no
+ ac_cv_lib_splashy_splashy_init=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_splashy_splashy_open" >&5
-echo "${ECHO_T}$ac_cv_lib_splashy_splashy_open" >&6; }
-if test $ac_cv_lib_splashy_splashy_open = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_splashy_splashy_init" >&5
+echo "${ECHO_T}$ac_cv_lib_splashy_splashy_init" >&6; }
+if test $ac_cv_lib_splashy_splashy_init = yes; then
SPLASHY_LIBS="-lsplashy"
else
{ { echo "$as_me:$LINENO: error: Required libsplashy was not found" >&5
@@ -22257,7 +22330,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by suspend $as_me 0.8.20080219, which was
+This file was extended by suspend $as_me 0.8.20080416, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22310,7 +22383,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-suspend config.status 0.8.20080219
+suspend config.status 0.8.20080416
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.8.20080219/configure.ac new/suspend-0.8.20080416/configure.ac
--- old/suspend-0.8.20080219/configure.ac 2008-02-19 16:34:24.000000000 +0100
+++ new/suspend-0.8.20080416/configure.ac 2008-04-16 18:44:52.000000000 +0200
@@ -7,7 +7,7 @@
#
AC_PREREQ([2.59])
-AC_INIT([suspend], [0.8.20080219])
+AC_INIT([suspend], [0.8.20080416])
AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([suspend.c])
@@ -16,96 +16,96 @@
AC_ARG_ENABLE(
[debug],
- [AC_HELP_STRING([--enable-debug], [Enable debug mode])],
+ [AC_HELP_STRING([--enable-debug], [enable debug mode])],
,
[enable_debug="no"]
)
AC_ARG_ENABLE(
[strict],
- [AC_HELP_STRING([--enable-strict], [Enable strict compile mode])],
+ [AC_HELP_STRING([--enable-strict], [enable strict compile mode])],
,
[enable_strict="no"]
)
AC_ARG_ENABLE(
[pedantic],
- [AC_HELP_STRING([--enable-pedantic], [Enable pedantic compile mode])],
+ [AC_HELP_STRING([--enable-pedantic], [enable pedantic compile mode])],
,
[enable_pedantic="no"]
)
AC_ARG_ENABLE(
[minimal],
- [AC_HELP_STRING([--enable-minimal], [Enable minimal build])],
+ [AC_HELP_STRING([--enable-minimal], [enable minimal build])],
,
[enable_minimal="no"]
)
AC_ARG_ENABLE(
[compress],
- [AC_HELP_STRING([--enable-compress], [Enable compress support])],
+ [AC_HELP_STRING([--enable-compress], [enable compress support])],
,
[enable_compress="no"]
)
AC_ARG_ENABLE(
[encrypt],
- [AC_HELP_STRING([--enable-encrypt], [Enable encryption support])],
+ [AC_HELP_STRING([--enable-encrypt], [enable encryption support])],
,
[enable_encrypt="no"]
)
AC_ARG_ENABLE(
[create-device],
- [AC_HELP_STRING([--enable-create-device], [Enable create required devices, use only if you don't have udev])],
+ [AC_HELP_STRING([--enable-create-device], [enable create required devices, use only if you don't have udev])],
,
[enable_create_device="no"]
)
AC_ARG_ENABLE(
[resume-static],
- [AC_HELP_STRING([--disable-resume-static], [Build resume as dynamic module])],
+ [AC_HELP_STRING([--disable-resume-static], [build resume as dynamic module])],
,
[enable_resume_static="yes"]
)
AC_ARG_ENABLE(
[splashy],
- [AC_HELP_STRING([--enable-splashy], [Enable splashy support])],
+ [AC_HELP_STRING([--enable-splashy], [enable splashy support])],
,
[enable_splashy="no"]
)
AC_ARG_ENABLE(
[fbsplash],
- [AC_HELP_STRING([--enable-fbsplash], [Enable fbsplash support])],
+ [AC_HELP_STRING([--enable-fbsplash], [enable fbsplash support])],
,
[enable_fbsplash="no"]
)
AC_ARG_WITH(
[devdir],
- [AC_HELP_STRING([--with-devdir=DIR], [Use if --enable-create-device, put devices in this directory, default /dev])],
+ [AC_HELP_STRING([--with-devdir=DIR], [use if --enable-create-device, put devices in this directory, default /dev])],
[devdir="${withval}"],
[devdir="/dev"]
)
AC_ARG_WITH(
[initramfsdir],
- [AC_HELP_STRING([--with-initramfsdir=DIR], [Put initramfs binaries in this directory, default LIBDIR/suspend])],
+ [AC_HELP_STRING([--with-initramfsdir=DIR], [put initramfs binaries in this directory, default LIBDIR/suspend])],
[initramfsdir="${withval}"],
[initramfsdir="\$(libdir)/suspend"]
)
AC_ARG_WITH(
[libgcrypt-prefix],
- [AC_HELP_STRING([--with-libgcrypt-prefix=DIR], [Define libgcrypt prefix, default /usr])],
+ [AC_HELP_STRING([--with-libgcrypt-prefix=DIR], [define libgcrypt prefix, default /usr])],
,
[with_libgcrypt_prefix="/usr" ]
)
AC_ARG_WITH(
[directfb-prefix],
- [AC_HELP_STRING([--with-directfb-prefix=DIR], [Define directfb prefix, default /usr])],
+ [AC_HELP_STRING([--with-directfb-prefix=DIR], [define directfb prefix, default /usr])],
,
[with_directfb_prefix="/usr" ]
)
AC_ARG_WITH(
[resume-device],
- [AC_HELP_STRING([--with-resume-device=DEVICE], [Define resume device (REQUIRED ONLY FOR BUILDING INITRAMFS DURING MAKE)])],
+ [AC_HELP_STRING([--with-resume-device=DEVICE], [define resume device (REQUIRED ONLY FOR BUILDING INITRAMFS DURING MAKE)])],
[RESUME_DEVICE="${withval}"]
)
AC_ARG_WITH(
[bootdir],
- [AC_HELP_STRING([--with-bootdir=DIR], [Define boot directory, default /boot (REQUIRED ONLY FOR BUILDING INITRAMFS DURING MAKE)])],
+ [AC_HELP_STRING([--with-bootdir=DIR], [define boot directory, default /boot (REQUIRED ONLY FOR BUILDING INITRAMFS DURING MAKE)])],
[bootdir="${withval}"],
[bootdir="/boot" ]
)
@@ -215,12 +215,15 @@
CONFIG_FEATURES="${CONFIG_FEATURES} splashy"
AC_DEFINE([CONFIG_SPLASHY], [1], [Define if splashy enabled])
+ # Workaround a wierd splashy issue
+ AC_CHECK_LIB([gcc_s], [strlen])
+
if test -z "${SPLASHY_LIBS}"; then
AC_ARG_VAR([SPLASHY_CFLAGS], [C compiler flags for libsplashy])
AC_ARG_VAR([SPLASHY_LIBS], [linker flags for libsplashy])
AC_CHECK_LIB(
[splashy],
- [splashy_open],
+ [splashy_init],
[SPLASHY_LIBS="-lsplashy"],
[AC_MSG_ERROR([Required libsplashy was not found])]
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.8.20080219/Makefile.am new/suspend-0.8.20080416/Makefile.am
--- old/suspend-0.8.20080219/Makefile.am 2007-11-06 00:31:02.000000000 +0100
+++ new/suspend-0.8.20080416/Makefile.am 2008-04-16 18:44:00.000000000 +0200
@@ -42,12 +42,12 @@
resume
dist_doc_DATA=\
TODO \
- README* \
HOWTO \
- COPYING*
+ $(srcdir)/README* \
+ $(srcdir)/COPYING*
endif
-install-data-hook:
+install-data-hook: install-sysconfDATA
if [ -f $(DESTDIR)$(sysconfdir)/suspend.conf ]; then \
$(INSTALL_DATA) $(srcdir)/conf/suspend.conf $(DESTDIR)$(sysconfdir)/suspend.conf.new; \
else \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.8.20080219/Makefile.in new/suspend-0.8.20080416/Makefile.in
--- old/suspend-0.8.20080219/Makefile.in 2008-02-19 16:35:55.000000000 +0100
+++ new/suspend-0.8.20080416/Makefile.in 2008-04-16 18:45:07.000000000 +0200
@@ -193,7 +193,8 @@
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
devDATA_INSTALL = $(INSTALL_DATA)
-am__dist_doc_DATA_DIST = TODO README* HOWTO COPYING*
+am__dist_doc_DATA_DIST = TODO HOWTO $(srcdir)/README* \
+ $(srcdir)/COPYING*
dist_docDATA_INSTALL = $(INSTALL_DATA)
sysconfDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dev_DATA) $(dist_doc_DATA) $(dist_noinst_DATA) \
@@ -364,9 +365,9 @@
@ENABLE_MINIMAL_FALSE@dist_doc_DATA = \
@ENABLE_MINIMAL_FALSE@ TODO \
-@ENABLE_MINIMAL_FALSE@ README* \
@ENABLE_MINIMAL_FALSE@ HOWTO \
-@ENABLE_MINIMAL_FALSE@ COPYING*
+@ENABLE_MINIMAL_FALSE@ $(srcdir)/README* \
+@ENABLE_MINIMAL_FALSE@ $(srcdir)/COPYING*
AM_CFLAGS = -DS2RAM $(LZO_CFLAGS) $(LIBGCRYPT_CFLAGS) $(am__append_4) \
$(am__append_6) $(am__append_9)
@@ -1142,7 +1143,7 @@
uninstall-sysconfDATA
-install-data-hook:
+install-data-hook: install-sysconfDATA
if [ -f $(DESTDIR)$(sysconfdir)/suspend.conf ]; then \
$(INSTALL_DATA) $(srcdir)/conf/suspend.conf $(DESTDIR)$(sysconfdir)/suspend.conf.new; \
else \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suspend-0.8.20080219/whitelist.c new/suspend-0.8.20080416/whitelist.c
--- old/suspend-0.8.20080219/whitelist.c 2008-02-19 16:31:29.000000000 +0100
+++ new/suspend-0.8.20080416/whitelist.c 2008-04-16 18:44:00.000000000 +0200
@@ -7,7 +7,7 @@
#include
#include "whitelist.h"
-char *whitelist_version = "$Id: whitelist.c,v 1.120 2008/02/19 15:26:19 seife Exp $";
+char *whitelist_version = "$Id: whitelist.c,v 1.121 2008/04/16 16:40:40 seife Exp $";
struct machine_entry whitelist[] = {
{ "IBM", "", "ThinkPad X32", "", RADEON_OFF|S3_BIOS|S3_MODE },
@@ -21,12 +21,16 @@
{ "Apple Computer, Inc.", "MacBook2,1", "", "", VBE_POST },
/* Julien BLACHE jb@jblache.org */
{ "Apple Computer, Inc.", "MacBookPro2,2", "", "", VBE_POST|VBE_MODE },
+ /* Tilman Vogel , only works from X */
+ { "Apple Inc.", "MacBookPro4,1", "", "", 0 },
/* Felix Rommel, https://bugzilla.novell.com/show_bug.cgi?id=228572 */
{ "Acer,Inc.", "Aspire 1350", "", "", VBE_POST|VBE_MODE|NOFB },
/* Andreas Wagner */
{ "Acer", "Aspire 1520", "", "", VBE_POST|VBE_MODE },
/* Giorgio Lando */
{ "Acer, inc.", "Aspire 1640 ", "", "", VBE_SAVE },
+ /* Stefano Costa */
+ { "Acer, inc.", "Aspire 1650 ", "", "", VBE_POST|VBE_MODE },
{ "Acer, inc.", "Aspire 1690 ", "", "", VBE_POST|VBE_SAVE },
/* Ricardo Garcia */
{ "Acer, inc.", "Aspire 3000 *", "", "", VBE_POST|VBE_MODE },
@@ -60,13 +64,15 @@
{ "Acer", "Extensa 2900", "", "", VBE_POST|VBE_MODE },
/* seife */
{ "Acer ", "Extensa 4150 *", "", "", S3_BIOS|S3_MODE },
+ /* Xavier Douville */
+ { "Acer ", "Extensa 5620 *", "", "", S3_BIOS|S3_MODE },
/* Libor Plucnar */
{ "Acer ", "Extensa 6220 *", "", "", S3_BIOS },
/* Hannes Reinecke https://bugzilla.novell.com/show_bug.cgi?id=354728 */
{ "Acer, inc.", "Ferrari 1000 ", "", "", VBE_POST|VBE_SAVE },
{ "Acer, inc.", "Ferrari 4000 ", "", "", VBE_POST|VBE_SAVE|NOFB },
- /* Russ Dill * does not work with fglrx */
- { "Acer, inc.", "Ferrari 5000 ", "", "", VBE_POST },
+ /* Russ Dill * does not work with fglrx, trenn@suse.de */
+ { "Acer, inc.", "Ferrari 5000 ", "", "", VBE_POST|VBE_MODE },
/* Sridar Dhandapani */
{ "Acer ", "TravelMate 230 ", "", "", S3_BIOS|S3_MODE },
{ "Acer ", "TravelMate 240 ", "", "", VBE_POST|VBE_SAVE },
@@ -106,7 +112,8 @@
/* gebu@seznam.cz */
{ "Acer", "TravelMate 4400", "", "", 0 },
{ "Acer ", "TravelMate 4650 *", "", "", S3_BIOS|S3_MODE },
-
+ /* */
+ { "Acer", "TravelMate 7520", "", "", S3_BIOS },
/* Andrea Zucchelli EEE-PC 4G */
{ "ASUSTeK Computer INC.", "701", "", "", VBE_POST|VBE_MODE },
/* From: Julien Puydt */
@@ -117,10 +124,12 @@
{ "ASUSTeK Computer Inc.*", "A6G ", "", "", 0 },
/* Arnout Boelens */
{ "ASUSTeK Computer Inc. ", "A6J *", "", "", VBE_POST|VBE_MODE },
+ /* Tom Gruben , maybe only with nvidia? */
+ { "ASUSTeK Computer Inc. ", "A6K *", "", "", 0 },
/* Patryk Zawadzki */
{ "ASUSTeK Computer Inc. ", "A6Km ", "", "", 0 },
/* Tom Malfrere */
- { "ASUSTeK Computer Inc. ", "A6Kt ", "", "", 0 },
+ { "ASUSTeK Computer Inc. ", "A6Kt ", "", "", S3_BIOS|S3_MODE },
/* Szalai Akos */
{ "ASUSTeK Computer Inc. ", "A6M", "", "", VBE_POST },
/* Anthony Mahe */
@@ -135,10 +144,14 @@
{ "ASUSTeK Computer Inc. ", "F3F *", "", "", S3_BIOS|S3_MODE },
/* Julien Puydt works from console and with nvidia driver */
{ "ASUSTeK Computer Inc. ", "F3F *", "", "", 0 },
+ /* Daniel Kinzler */
+ { "ASUSTeK Computer Inc. ", "F3JC *", "", "", S3_BIOS|S3_MODE },
/* Marco Jorge */
{ "ASUSTeK Computer Inc. ", "F3JP *", "", "", VBE_POST|VBE_MODE },
/* Vladimir Pouzanov , probably only with nvidia and from X */
{ "ASUSTeK Computer INC. ", "F3T", "", "", 0 },
+ /* Asus Mainboard, Ian McAnena */
+ { "ASUSTeK Computer Inc.", "K8V-MX", "", "", 0 },
{ "ASUSTEK ", "L2000D", "", "", S3_MODE },
{ "ASUSTEK ", "L3000D", "", "", VBE_POST|VBE_SAVE },
/* Carl Troein */
@@ -150,6 +163,8 @@
/* Manfred Tremmel, https://bugzilla.novell.com/show_bug.cgi?id=171107 */
{ "ASUSTeK Computer Inc. ", "M6N ", "", "", S3_BIOS|S3_MODE },
{ "ASUSTeK Computer Inc. ", "M6Ne ", "", "", S3_MODE },
+ /* Galeffi Christian gallochri2@alice.it */
+ { "ASUSTeK Computer Inc. ", "M51Sr *", "", "", S3_MODE },
/* Charles de Miramon */
{ "ASUSTeK Computer Inc. ", "M5N ", "", "", S3_BIOS|S3_MODE },
/* M6VA, seraphim@glockenbach.net */
@@ -158,6 +173,8 @@
{ "ASUSTeK Computer Inc. ", "M7A ", "", "", S3_BIOS|S3_MODE },
/* ASUS S5200N Philip Frei */
{ "ASUSTeK Computer Inc. ", "S5N ", "", "", S3_BIOS|S3_MODE },
+ /* Tobias Rothe */
+ { "ASUSTeK Computer Inc. ", "U3S *", "", "", VBE_POST|VBE_SAVE },
/* ASUS U5F, Krzysztof Krzyzaniak */
{ "ASUSTeK Computer Inc. ", "U5F *", "", "", S3_BIOS },
/* ASUS V6V, Johannes Engel */
@@ -174,6 +191,8 @@
{ "ERGOUK ", "M2N ", "", "", S3_BIOS|S3_MODE },
/* ASUS Mainboard, Christoph Jaeschke */
{ "ASUSTek Computer Inc.", "K8N-E-Deluxe", "", "", S3_BIOS },
+ /* ASUS A7V Mainboard, Michael Klein */
+ { "", "", "", "ASUS A7V ACPI BIOS Revision *", 0 },
/* ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version :-(
reported by James Spencer */
{ "", "", "", "ASUS A7V600 ACPI BIOS Revision *", S3_BIOS|S3_MODE },
@@ -201,6 +220,8 @@
{ "BENQ", "JoyBook 7000", "GRASSHOPPER2", "", S3_BIOS|S3_MODE },
/* Andreas Schmitz */
{ "BenQ ", "Joybook R22", "", "", S3_BIOS|S3_MODE },
+ /* Paul Duncan */
+ { "BenQ", "Joybook S52", "", "", VBE_POST|VBE_MODE },
/* Gilles Grandou */
{ "CLEVO", "D500P", "", "", VBE_POST|NOFB },
/* Francisco Neto */
@@ -259,6 +280,8 @@
{ "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 },
+ /* Felipe Alvarez https://bugzilla.novell.com/show_bug.cgi?id=364429 */
+ { "Dell Computer Corporation", "Inspiron 5160*", "", "", VBE_POST|VBE_MODE },
{ "Dell Computer Corporation", "Inspiron 8000 *", "", "", VBE_POST|VBE_SAVE },
/* by Henare Degan 8500 w. NVidia card. There are also 8500s w. ATI cards */
{ "Dell Computer Corporation", "Inspiron 8500 *", "", "", VBE_POST|VBE_SAVE },
@@ -272,10 +295,14 @@
{ "Dell Computer Corporation", "Latitude CPx J650GT*", "", "", 0 },
/* Luke Myers */
{ "Dell Computer Corporation", "Latitude CPx J800GT*", "", "", VBE_POST|VBE_MODE },
+ /* https://bugzilla.novell.com/show_bug.cgi?id=366460 */
+ { "Dell Computer Corporation", "Latitude D400 *", "", "", 0 },
/* https://bugzilla.novell.com/show_bug.cgi?id=220865 */
{ "Dell Inc.", "Latitude D410 *", "", "", VBE_POST|VBE_MODE },
/* tested by seife and Nenad ANTONIC */
{ "Dell Inc.", "Latitude D420 *", "", "", VBE_POST|VBE_MODE },
+ /* Benoit Gschwind */
+ { "Dell Inc.", "Latitude D430 *", "", "", VBE_POST|VBE_MODE },
/* Roland Hagemann */
{ "Dell Computer Corporation", "Latitude D500 *", "", "", VBE_POST|VBE_SAVE },
/* Ian Samule, https://bugzilla.novell.com/show_bug.cgi?id=175568 */
@@ -313,8 +340,11 @@
{ "Dell Inc.", "MXG061 *", "", "", 0 },
/* Dell XPS M1330, Danny Kukawka */
{ "Dell Inc.", "XPS M1330 *", "", "", VBE_POST|VBE_MODE },
- /* Pierre maybe only with nvidia driver...*/
+ /* Pierre maybe only with nvidia driver...
+ Elie Roux */
{ "Dell Inc.", "XPS M1530 *", "", "", 0 },
+ /* Ian McAnena */
+ { "Dell Computer Corporation", "OptiPlex GX260 *", "", "", 0 },
/* Desktop with Intel graphics, Sitsofe Wheeler */
{ "Dell Inc. ", "OptiPlex GX520 *", "", "", VBE_POST|VBE_MODE },
/* Christoph Pacher , maybe only with nvidia driver :-( */
@@ -349,6 +379,8 @@
{ "FUJITSU SIEMENS", "Amilo A7645 ", "", "", VBE_SAVE|S3_BIOS|S3_MODE },
/* Chris Hammond Amilo A 1630 */
{ "FUJITSU SIEMENS", "Amilo A Series", "0.01", "", VBE_POST|VBE_SAVE },
+ /* Hendrik Golzke */
+ { "FUJITSU SIEMENS", "Amilo D Series", "", "", VBE_POST|VBE_MODE },
/* Reiner Herrmann , this one realls needs VBE_SAVE
since there are many different models of the "AMILO M" series, i do a very exact match */
{ "FUJITSU SIEMENS", "AMILO M ", "-1 *", "R01-S0Z *", VBE_POST|VBE_SAVE },
@@ -362,6 +394,8 @@
{ "FUJITSU SIEMENS", "AMILO Pi 1505", "", "", S3_BIOS|S3_MODE },
/* Giorgos Mavrikas */
{ "FUJITSU SIEMENS", "AMILO Pi 1536", "", "", VBE_POST|VBE_MODE },
+ /* Yasen Pramatarov */
+ { "FUJITSU SIEMENS", "AMILO Pi 2515", "", "", VBE_POST|VBE_MODE },
/* Aleksandar Markovic */
{ "FUJITSU SIEMENS", "AMILO PRO V2030", "", "", VBE_POST|VBE_MODE },
/* some unknown contributor */
@@ -388,12 +422,18 @@
{ "FUJITSU SIEMENS", "LIFEBOOK E8410", "", "", S3_BIOS|S3_MODE },
/* Stephen Gildea */
{ "FUJITSU", "LifeBook P7010D", "", "", S3_BIOS },
+ /* Michael Hillerstrom */
+ { "FUJITSU SIEMENS", "LIFEBOOK P7230", "", "", S3_BIOS|S3_MODE|PCI_SAVE },
/* Andi Kleen, reported to work in 64bit mode */
{ "FUJITSU", "LifeBook S2110", "", "", S3_BIOS },
+ /* Fred Lahuis */
+ { "FUJITSU SIEMENS", "LIFEBOOK S6410", "", "", VBE_POST|VBE_MODE },
/* , tested with X only */
{ "FUJITSU SIEMENS", "LIFEBOOK S7010", "", "", 0 },
/* Antonio Cardoso Martins */
{ "FUJITSU SIEMENS", "LIFEBOOK S7020", "", "", S3_BIOS|S3_MODE|PCI_SAVE },
+ /* Samuel Tardieu */
+ { "FUJITSU SIEMENS", "LIFEBOOK S7110", "", "", 0 },
/* David Nolden */
{ "FUJITSU", "LifeBook T Series", "", "", 0 },
/* Alexander Clouter , needs vbe_save or the vga mode is upset */
@@ -432,17 +472,26 @@
{ "MTC", "Montara-GML ", "FAB-2", "", 0 },
/* Josef Zenisek */
{ "Gigabyte Technology Co., Ltd.", "945GZM-S2", "", "", 0 },
+ /* Art Mitskevich */
+ { "Gigabyte Technology Co., Ltd.", "945GCMX-S2", "", "", VBE_POST|VBE_MODE },
+ /* Roberto Lumbreras */
+ { "Gigabyte Technology Co., Ltd.", "P35-DS4", "", "", VBE_POST|VBE_MODE },
/* Andrey Melentyev */
{ "Infomash", "RoverBook", "", "", VBE_POST|VBE_MODE },
/* Stefan Kulow https://bugzilla.novell.com/show_bug.cgi?id=362928 */
{ "Hewlett-Packard", "HP Compaq 2510p Notebook PC", "", "68MSP*", VBE_POST|VBE_MODE },
+ /* Holger Sickenberg https://bugzilla.novell.com/show_bug.cgi?id=376715 */
+ { "Hewlett-Packard", "HP Compaq 2710p *", "", "68MOU*", VBE_POST|VBE_MODE },
+ /* i wonder if we can just match for "HP Compaq 6510b.... */
/* Jamil Djadala */
{ "Hewlett-Packard", "HP Compaq 6510b (GB863EA*", "","68DDU*", VBE_POST|VBE_MODE },
/* Michal Sojka */
{ "Hewlett-Packard", "HP Compaq 6710b (GB893EA*", "","68DDU*", VBE_POST|VBE_MODE },
/* Harry ten Berge */
{ "Hewlett-Packard", "HP Compaq 6710b (GB893ET*", "","68DDU*", VBE_POST|VBE_MODE },
+ /* Darek Nawrocki */
+ { "Hewlett-Packard", "HP Compaq 6715b (GB834EA*", "","68YTT*", VBE_POST|VBE_MODE },
/* Paul Smet */
{ "Hewlett-Packard", "HP Compaq 6720s", "", "68MDU*", VBE_POST|VBE_MODE },
/* Tomas Kejzlar */
@@ -505,13 +554,18 @@
/* Michael Meskes , this is a NX 7400 */
{ "Hewlett-Packard", "", "", "68YGU*", VBE_POST },
{ "Hewlett-Packard", "HP Compaq nx8220 *", "", "", VBE_SAVE|NOFB },
- /* Stefan Seyfried novell bug 259831 */
- { "Hewlett-Packard", "HP Compaq nw8440 (EY696AA*", "", "68YVD*", VBE_POST|VBE_MODE },
+ /* Stefan Seyfried novell bug 259831, this machine is only available in one
+ configuration (ATI Graphics) */
+ { "Hewlett-Packard", "HP Compaq nw8440 *", "", "68YVD*", VBE_POST|VBE_MODE },
+ /* Ryan Bair */
+ { "Hewlett-Packard", "HP d530 SFF*", "", "", 0 },
/* Frederic Mothe */
{ "Hewlett Packard", "", "HP OmniBook XE3 GC *", "", VBE_POST|VBE_SAVE },
{ "Hewlett Packard", "", "HP OmniBook XE3 GF *", "", VBE_POST|VBE_SAVE },
/* Bernd Rinn */
{ "Hewlett Packard", "", "HP OmniBook XT1000 *", "", S3_MODE },
+ /* Jari Turkia */
+ { "Hewlett-Packard *", "Presario 2100 (DP835E)*", "", "", 0 },
/* Matto Marjanovic */
{ "Hewlett-Packard", "Presario C500 (RZ341UA#*", "", "", 0 },
/* Fatih Alabas https://bugzilla.novell.com/show_bug.cgi?id=230528 */
@@ -535,6 +589,8 @@
{ "Hewlett-Packard ", "Compaq Presario X1000 (DK454AV)*", "", "", S3_BIOS },
/* S.Çağlar Onur , works only from X! */
{ "Hewlett-Packard", "HP Pavilion dv2000 (GF759EA#*", "", "", 0 },
+ /* Tarek Soliman */
+ { "Hewlett-Packard", "HP Pavilion dv2000 (GA534UA#*", "", "", 0 },
/* Robert Hart */
{ "Hewlett-Packard", "HP Pavilion dv2500 Notebook PC", "", "", 0 },
/* Fabio Comolli , dv4378ea, ATI X700 */
@@ -563,8 +619,9 @@
{ "Hewlett-Packard", "HP Pavilion dv6000 (RM469EA#*","", "", 0 },
/* John Soros "HP dv6120ea" */
{ "Hewlett-Packard", "HP Pavilion dv6000 (RP980EA#*","", "", 0 },
- /* Fran Firman , maybe only works due to the Nvidia driver? */
- { "Hewlett-Packard", "HP Pavilion dv6500 Notebook PC *", "", "", 0 },
+ /* Fran Firman , no hacks, maybe only works due to the Nvidia driver?
+ Marco Nenciarini needs S3_BIOS */
+ { "Hewlett-Packard", "HP Pavilion dv6500 Notebook PC *", "", "", S3_BIOS },
/* */
{ "Hewlett-Packard", "HP Pavilion tx1000 Notebook PC *", "", "", 0 },
/* Etienne URBAH */
@@ -575,12 +632,16 @@
{ "Hewlett-Packard ", "Pavilion zt3300 (PF083UA#*", "", "", 0 },
/* Karthik */
{ "Hewlett-Packard ", "Pavilion zt3300 *", "", "68BAL*", S3_BIOS },
+ /* Gijs van Gemert */
+ { "HP-Pavilion", "RZ418AA-ABH s3020*", "", "", VBE_MODE },
/* Benjamin Cherian */
{ "HP Pavilion 061", "D7223K-ABA A650E", "", "", 0 },
/* A desktop with integrated graphics, Bo Thysell */
{ "HP Pavilion 061", "EJ192AA-ABS t3250.se", "", "", 0 },
/* Michael Zaugg */
{ "HP Pavilion 061", "EP198AA-UUZ t3335.ch", "", "", 0 },
+ /* Stefan Friedrich */
+ { "HP Pavilion 061", "ES061AA-ABD t3320*", "", "", 0 },
/* R51 confirmed by Christian Zoz and Sitsofe Wheeler */
{ "IBM", "", "ThinkPad R51", "", 0 },
@@ -637,8 +698,154 @@
{ "IBM", "2653*", "", "", RADEON_OFF },
/* X41, Florian Ragwitz , */
{ "IBM", "2525*", "", "", S3_BIOS|S3_MODE },
+ /* X41, Johannes Zellner */
+ { "IBM", "2526*", "", "", S3_BIOS|S3_MODE },
/* Ralph Thormann, notice the empty sys_product :-( */
{ "IBM", " ", "ThinkPad X40", "1UETD2WW*", 0 },
+ /* Joerg Platte jplatte@naasa.net, again emtpy sys_product... */
+ { "IBM", " ", "ThinkPad T40 ","1RETDRWW*", 0 },
+
+ /* Bunch of entries from _Lenovo_ */
+ /* those with "no hack needed" are machines with NVidia graphics, working only
+ with (probably a specific version of) the nvidia driver.
+ I have to think about what to do with those... */
+#if 0
+ /* T61 */
+ { "LENOVO", "6457*", "", "", 0 },
+ { "LENOVO", "6458*", "", "", 0 },
+ { "LENOVO", "6459*", "", "", 0 },
+ { "LENOVO", "6460*", "", "", 0 },
+ { "LENOVO", "6461*", "", "", 0 },
+ { "LENOVO", "6462*", "", "", 0 },
+ { "LENOVO", "6470*", "", "", 0 },
+ { "LENOVO", "7662*", "", "", 0 },
+ { "LENOVO", "7663*", "", "", 0 },
+ { "LENOVO", "7664*", "", "", 0 },
+ { "LENOVO", "7665*", "", "", 0 },
+ { "LENOVO", "6377*", "", "", 0 },
+ { "LENOVO", "1959*", "", "", 0 },
+ { "LENOVO", "6481*", "", "", 0 },
+ /* R61 Discrete */
+ { "LENOVO", "8889*", "", "", 0 },
+ { "LENOVO", "8890*", "", "", 0 },
+ { "LENOVO", "8891*", "", "", 0 },
+ { "LENOVO", "8892*", "", "", 0 },
+ { "LENOVO", "8893*", "", "", 0 },
+ { "LENOVO", "8894*", "", "", 0 },
+ /* R61 */
+ { "LENOVO", "7742*", "", "", 0 },
+ { "LENOVO", "7743*", "", "", 0 },
+ { "LENOVO", "7744*", "", "", 0 },
+ { "LENOVO", "7751*", "", "", 0 },
+ { "LENOVO", "7753*", "", "", 0 },
+ { "LENOVO", "7754*", "", "", 0 },
+ { "LENOVO", "7755*", "", "", 0 },
+ //
+ { "LENOVO", "8914*", "", "", 0 },
+ { "LENOVO", "8918*", "", "", 0 },
+ { "LENOVO", "8919*", "", "", 0 },
+ { "LENOVO", "8920*", "", "", 0 },
+ { "LENOVO", "8927*", "", "", 0 },
+ { "LENOVO", "8928*", "", "", 0 },
+ { "LENOVO", "8929*", "", "", 0 },
+#endif
+ /* T61 */
+ { "LENOVO", "6463*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6464*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6465*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6466*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6467*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6468*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6471*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8938*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8939*", "", "", S3_BIOS|S3_MODE },
+
+ { "LENOVO", "7658*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7659*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7660*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7661*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6378*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6379*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6480*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8895*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8896*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8897*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8898*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8899*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8900*", "", "", S3_BIOS|S3_MODE },
+ /* R61 */
+ { "LENOVO", "7732*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7733*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7734*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7735*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7736*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7737*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7738*", "", "", S3_BIOS|S3_MODE },
+ /* X61s */
+ { "LENOVO", "7666*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7667*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7668*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7669*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7670*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7671*", "", "", S3_BIOS|S3_MODE },
+ /* X61*/
+ { "LENOVO", "7673*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7674*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7675*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7676*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7678*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7679*", "", "", S3_BIOS|S3_MODE },
+ /* T61 / R61 2008-01-29, bug https://bugzilla.novell.com/show_bug.cgi?id=334522#c10 */
+ { "LENOVO", "4108*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "4141*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "4143*", "", "", S3_BIOS|S3_MODE },
+#if 0
+ { "LENOVO", "4109*", "", "", 0 },
+ { "LENOVO", "4142*", "", "", 0 },
+ { "LENOVO", "4144*", "", "", 0 },
+#endif
+ /* https://bugzilla.novell.com/show_bug.cgi?id=353896 */
+ /*ThinkPad X61 Tablet*/
+ { "LENOVO", "7762*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7763*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7764*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7767*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7768*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7769*", "", "", S3_BIOS|S3_MODE },
+ /*ThinkPad R61*/
+ { "LENOVO", "7642*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7643*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7644*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7645*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7646*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7647*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7648*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7649*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7650*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "7657*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8930*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8932*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8933*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8934*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8935*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8936*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8937*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8942*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8943*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8944*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8945*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8946*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8947*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "8948*", "", "", S3_BIOS|S3_MODE },
+ /* https://bugzilla.novell.com/show_bug.cgi?id=353896 end */
+ /* LENOVO X300, 2008-04-03 https://bugzilla.novell.com/show_bug.cgi?id=370690 */
+ { "LENOVO", "6476*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6477*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6478*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "2478*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "2479*", "", "", S3_BIOS|S3_MODE },
+ /* EndOfLenovoBunch */
+
/* X60 / X60s */
{ "LENOVO", "1702*", "", "", S3_BIOS|S3_MODE },
{ "LENOVO", "1704*", "", "", S3_BIOS|S3_MODE },
@@ -666,6 +873,12 @@
{ "LENOVO", "6460*", "", "", S3_BIOS|VBE_MODE },
/* Amit Joshi , T61 */
{ "LENOVO", "6465*", "", "", S3_BIOS|VBE_MODE },
+ /* LENOVO X300, https://bugzilla.novell.com/show_bug.cgi?id=370690 */
+ { "LENOVO", "6476*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6477*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "6478*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "2478*", "", "", S3_BIOS|S3_MODE },
+ { "LENOVO", "2479*", "", "", S3_BIOS|S3_MODE },
/* T61, Joe Nahmias , debian bug #432018 */
{ "LENOVO", "7658*", "", "", S3_BIOS|S3_MODE },
/* T61 with NVidia card, https://bugzilla.novell.com/show_bug.cgi?id=290618 */
@@ -689,6 +902,8 @@
{ "LENOVO", "7732*", "", "", S3_BIOS },
/* , R61 */
{ "LENOVO", "7738*", "", "", S3_BIOS|S3_MODE },
+ /* Stephane Delcroix https://bugzilla.novell.com/show_bug.cgi?id=362945 */
+ { "LENOVO", "7762*", "", "", S3_BIOS|S3_MODE },
/* Danny Kukawka ThinkPad X61 Tablet */
{ "LENOVO", "7768*", "", "", S3_BIOS|S3_MODE },
/* T61, intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE */
@@ -708,6 +923,8 @@
{ "LENOVO", "", "ThinkPad T60p", "", S3_BIOS|S3_MODE },
/* T60 From: Jeff Nichols and Kristofer Hallgren */
{ "LENOVO", "", "ThinkPad T60", "", S3_BIOS|S3_MODE },
+ /* T61, 7658Q4U, From: Frank Seidel */
+ { "LENOVO", "7658*", "ThinkPad T61", "", S3_BIOS|S3_MODE },
/* Paul Wilkinson */
{ "LENOVO", "", "ThinkPad Z61p", "", S3_BIOS|S3_MODE },
/* Z61m From: Roderick Schertler */
@@ -761,6 +978,8 @@
{ "MEDIONNB ", "WID2010 ", "", "", VBE_POST|VBE_MODE },
/* Mike Galbraith needs X to get text console back */
{ "MEDIONPC", "MS-7012", "", "", 0 },
+ /* Andreas Kostyrka */
+ { "MICRO-STAR INT'L CO.,LTD", "MS-1012", "", "", S3_BIOS },
/* Matthijs Kooijman */
{ "MICRO-STAR INT'L CO.,LTD", "MS-1013", "", "", S3_BIOS },
/* Gergely Csepany */
@@ -814,10 +1033,16 @@
{ "Samsung Electronics", "SM40S", "", "", S3_BIOS|S3_MODE },
/* Pavel Machek, Samsung UMPC */
{ "SAMSUNG ELECTRONICS CO., LTD.", "SQ1US", "01ME", "", VBE_SAVE },
+ /* Maximilian Mehnert */
+ { "SAMSUNG ELECTRONICS CO., LTD.", "SQ35S", "", "", VBE_POST },
+ /* Frank Ruell */
+ { "SAMSUNG ELECTRONICS CO., LTD.", "SQ45S70S", "", "", S3_BIOS|S3_MODE },
/* Konstantin Krasnov , only with kernel 2.6.24++ */
{ "SAMSUNG ELECTRONICS CO., LTD.", "SX22S", "07AJ", "", VBE_SAVE },
/* Martin Wilck */
{ "Samsung Electronics", "SX50S", "Revision MP", "", 0 },
+ /* */
+ { "Shuttle Inc", "SD11V10", "", "", S3_BIOS|S3_MODE },
/* foren@nuxli.ch */
{ "Shuttle Inc", "SN41UV10", "", "", VBE_POST|VBE_MODE },
/* Thomas Peuss */
@@ -829,6 +1054,8 @@
{ "TOSHIBA", "Libretto L5/TNKW", "", "", 0 },
/* Hans-Hermann Jopski Tecra A2 PTA20E-4M301VGR */
{ "TOSHIBA", "Portable PC", "Version 1.0", "Version 1.20", 0 },
+ /* a PORTEGE 100 :-( mykhal@centrum.cz */
+ { "TOSHIBA", "Portable PC", "Version 1.0", "Version 1.60", S3_MODE },
/* this is a Toshiba Satellite 4080XCDT, believe it or not :-( */
{ "TOSHIBA", "Portable PC", "Version 1.0", "Version 7.80", S3_MODE },
/* Pavel Borzenkov , Toshiba Portege 3490CT, works correctly for me */
@@ -853,6 +1080,8 @@
{ "TOSHIBA", "Satellite A200", "", "", S3_BIOS|S3_MODE },
/* Gavin Kinsey */
{ "TOSHIBA", "Satellite A210", "", "", S3_BIOS|S3_MODE },
+ /* David Picella sys_version = "PSAFGU-048002" */
+ { "TOSHIBA", "Satellite A215", "", "", S3_BIOS|S3_MODE|PCI_SAVE },
/* Christian Schneeman */
{ "TOSHIBA", "Satellite L10", "", "", VBE_POST|VBE_MODE },
/* Gijs van Gemert */
@@ -867,6 +1096,8 @@
{ "TOSHIBA", "Satellite M70", "", "", S3_BIOS|S3_MODE },
/* Antonis Tsolomitis */
{ "TOSHIBA", "Satellite P10", "", "", S3_BIOS|S3_MODE },
+ /* zu@ten.ch sys_version = "PSPAGE-00H00RS4" */
+ { "TOSHIBA", "Satellite P100", "", "", 0 },
/* From: mire */
{ "TOSHIBA", "Satellite P200", "", "", S3_BIOS|S3_MODE },
/* cl.kerr@gmail.com */
@@ -879,6 +1110,8 @@
{ "TOSHIBA", "Satellite U305", "", "", VBE_POST|VBE_MODE },
/* Bram Senders */
{ "TOSHIBA", "SP4600", "Version 1.0", "", 0 },
+ /* Thomas Zander sys_version "PTA83E-0E303LDU" */
+ { "TOSHIBA", "TECRA A8", "", "", 0 },
/* Arne Salveter sys_version "PTS52E-00X00GGR" */
{ "TOSHIBA", "TECRA A9", "", "", 0 },
/* Dr. Stephan Buehne */
@@ -916,14 +1149,20 @@
/* Olivier Saier , apparently S3_BIOS locks the machine hard */
{ "Sony Corporation", "VGN-FS115Z", "", "", S3_MODE },
/* S.Çağlar Onur */
- { "Sony Corporation", "VGN-FS215B", "", "", 0 },
+ { "Sony Corporation", "VGN-FS215B", "", "", 0 },
+ /* Tim Felgentreff */
+ { "Sony Corporation", "VGN-FS485B", "", "", S3_BIOS|S3_MODE },
/* Joseph Smith */
{ "Sony Corporation", "VGN-FS660_W", "", "", 0 },
+ /* Stefano Avallone */
+ { "Sony Corporation", "VGN-FZ39VN", "", "", 0 },
/* daryl@mail.bg */
{ "Sony Corporation", "VGN-SZ340P", "", "", 0 },
/* Pedro M. S. Oliveira , machine has two gfx cards,
works only well with the intel, not with the nvidia */
{ "Sony Corporation", "VGN-SZ5XN_C", "", "", 0 },
+ /* Michal Bozek */
+ { "Sony Corporation", "VGN-SZ61XN_C", "", "", S3_BIOS },
/* Anton Zahlheimer */
{ "Sony Corporation", "VGN-T250P", "", "", S3_BIOS|S3_MODE },
/* Timo Hoenig VGN-TX3HP */
@@ -932,6 +1171,8 @@
{ "Sony Corporation", "VGN-TX3XP_L", "", "", S3_BIOS|S3_MODE },
/* Danny Kukawka , TX5MN from Michael Matz */
{ "Sony Corporation", "VGN-TX5MN_W", "", "", VBE_MODE },
+
+ { "Sony Corporation", "VGN-TX770P", "", "", VBE_POST|VBE_MODE },
/* Pier Paolo Pittavino , Timo Hoenig */
{ "Sony Corporation", "VGN-TZ11*", "", "", 0 },
/* Hans Gunnarsson */
@@ -952,6 +1193,8 @@
{ "Sony Corporation", "PCG-FX601*", "", "", S3_BIOS|S3_MODE },
/* Loki Harfagr */
{ "Sony Corporation", "PCG-FX802*", "", "", VBE_SAVE|VBE_MODE },
+ /* Stefan Friedrich */
+ { "Sony Corporation", "PCG-FX805*", "", "", VBE_POST|VBE_SAVE },
/* Marco Nenciarini */
{ "Sony Corporation", "PCG-GRT916Z*", "", "", 0 },
{ "Sony Corporation", "PCG-GRT995MP*", "", "", 0 },
@@ -1091,7 +1334,6 @@
// X41
{ "IBM", "1864*", "", "", VBE_POST|VBE_SAVE|UNSURE },
{ "IBM", "1865*", "", "", VBE_POST|VBE_SAVE|UNSURE },
- { "IBM", "2526*", "", "", VBE_POST|VBE_SAVE|UNSURE },
{ "IBM", "2527*", "", "", VBE_POST|VBE_SAVE|UNSURE },
{ "IBM", "2528*", "", "", VBE_POST|VBE_SAVE|UNSURE },
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org