Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2013-08-12 16:15:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suspend" Changes: -------- --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2013-04-05 17:06:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2013-08-12 16:15:55.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Aug 9 07:42:32 UTC 2013 - [email protected] + +- [openSUSE goes SLE12]: suspend: Change and/or patches may have + been lost (bnc#831865) +- add following patch and corresponding changelog from SLE11 + remove-swich-message-for-s390x.diff + s2disk-disable-splash-when-unable-to-switch-vts.patch + s2disk-do-not-fail-without-local-terminals.patch + suspend-dont-exclude-s390.patch + suspend-ignore-acpi-video-flags-not-available.patch + whitelist_ibm_iplex_dx360_s2ram.patch +- suspend-do-not-apply-quirks-if-KMS-driver-is-in-use.patch is + upstreamed so not included +- s2disk-do-not-fail-hibernation-withoug-a-vt-console is removed + becasue same with s2disk-do-not-fail-without-local-terminals.patch + +------------------------------------------------------------------- @@ -6,0 +24,5 @@ +Wed Apr 3 07:45:09 UTC 2013 - [email protected] + +- Whitelist iplex dx360 M4 more general to get all of them (bnc#813062) + +------------------------------------------------------------------- @@ -16,0 +39,12 @@ +Tue Jan 15 16:10:20 UTC 2013 - [email protected] + +- Whitelist iplex dx360 M4 for s2ram (bnc#797754, fate#313990) + +------------------------------------------------------------------- +Wed Dec 5 10:49:02 CET 2012 - [email protected] + +- add suspend-ignore-acpi-video-flags-not-available.patch: + Don't bail out if /proc/acpi/acpi_video_flags is not available, + try anyway (bnc#788372) + +------------------------------------------------------------------- @@ -49,0 +84,5 @@ +Wed Dec 7 18:29:40 CET 2011 - [email protected] + +- Remove confusing message for s390x (bnc#723835) + +------------------------------------------------------------------- @@ -54,0 +94,7 @@ +Thu Nov 24 15:01:20 CET 2011 - [email protected] + +- add patch: + s2disk-disable-splash-when-unable-to-switch-vts.patch + (bnc#723835) + +------------------------------------------------------------------- @@ -59,0 +106,6 @@ +Wed Jun 22 10:07:07 CEST 2011 - [email protected] + +- add patch: s2disk-do-not-fail-without-local-terminals.patch + (bnc#592780,fate#309479) + +------------------------------------------------------------------- @@ -78,0 +131,6 @@ + +------------------------------------------------------------------- +Thu Jan 21 12:24:45 CET 2010 - [email protected] + +- Enable build for s390(x) (bnc#568268) +- Add suspend-dont-exclude-s390.patch Old: ---- s2disk-do-not-fail-hibernation-withoug-a-vt-console New: ---- remove-swich-message-for-s390x.diff s2disk-disable-splash-when-unable-to-switch-vts.patch s2disk-do-not-fail-without-local-terminals.patch suspend-dont-exclude-s390.patch suspend-ignore-acpi-video-flags-not-available.patch whitelist_ibm_iplex_dx360_s2ram.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.v9T7Ny/_old 2013-08-12 16:15:56.000000000 +0200 +++ /var/tmp/diff_new_pack.v9T7Ny/_new 2013-08-12 16:15:56.000000000 +0200 @@ -60,11 +60,16 @@ Patch12: suspend-buildfixes.diff Patch13: suspend-0.80-vbetool-retry-on-errors.diff Patch16: suspend-splash-verbose-debug.diff +Patch17: suspend-dont-exclude-s390.patch +Patch18: s2disk-do-not-fail-without-local-terminals.patch +Patch19: s2disk-disable-splash-when-unable-to-switch-vts.patch #Mandriva patch to enable plymouth support (Thanks to F. Crozat) -Patch17: suspend-plymouth.patch -Patch18: s2disk-do-not-fail-hibernation-withoug-a-vt-console +Patch20: suspend-plymouth.patch +Patch21: suspend-ignore-acpi-video-flags-not-available.patch +Patch22: whitelist_ibm_iplex_dx360_s2ram.patch # fix for automake-1.13.1 -Patch19: suspend-automake-1_13.diff +Patch23: suspend-automake-1_13.diff +Patch100: remove-swich-message-for-s390x.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -99,6 +104,11 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch100 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++++++ remove-swich-message-for-s390x.diff ++++++ --- a/suspend.c +++ b/suspend.c @@ -2499,8 +2499,10 @@ vt_fd = prepare_console(&orig_vc, &suspend_vc); if (vt_fd < 0) { if (vt_fd == -ENOTTY) { +#ifndef s390x suspend_warning("Unable to switch virtual terminals, " "using the current console."); +#endif splash_param = 0; } else { suspend_error("Could not open a virtual terminal."); ++++++ s2disk-disable-splash-when-unable-to-switch-vts.patch ++++++ --- suspend.c | 1 + 1 file changed, 1 insertion(+) Index: suspend-0.8.20081103/suspend.c =================================================================== --- suspend-0.8.20081103.orig/suspend.c +++ suspend-0.8.20081103/suspend.c @@ -2501,6 +2501,7 @@ int main(int argc, char *argv[]) if (vt_fd == -ENOTTY) { suspend_warning("Unable to switch virtual terminals, " "using the current console."); + splash_param = 0; } else { suspend_error("Could not open a virtual terminal."); ret = errno; ++++++ s2disk-do-not-fail-without-local-terminals.patch ++++++ --- suspend.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) Index: suspend-utils-1.0/suspend.c =================================================================== --- suspend-utils-1.0.orig/suspend.c +++ suspend-utils-1.0/suspend.c @@ -57,6 +57,15 @@ do { \ fprintf(stderr, "%s: " msg " Reason: %m\n", my_name, ## args); \ } while (0) +#ifndef CONFIG_ARCH_S390 +#define suspend_warning(msg) \ +do { \ + fprintf(stderr, "%s: " msg "\n", my_name); \ +} while (0) +#else +#define suspend_warning(msg) +#endif + static char snapshot_dev_name[MAX_STR_LEN] = SNAPSHOT_DEVICE; static char resume_dev_name[MAX_STR_LEN] = RESUME_DEVICE; static loff_t resume_offset; @@ -2489,21 +2498,24 @@ int main(int argc, char *argv[]) vt_fd = prepare_console(&orig_vc, &suspend_vc); if (vt_fd < 0) { - ret = errno; - if (vt_fd == -ENOTTY) - suspend_error("No local tty. Remember to specify local " \ - "console after the remote."); - else + if (vt_fd == -ENOTTY) { + suspend_warning("Unable to switch virtual terminals, " + "using the current console."); + } else { suspend_error("Could not open a virtual terminal."); - goto Close_snapshot_fd; + ret = errno; + goto Close_snapshot_fd; + } } splash_prepare(&splash, splash_param); - if (lock_vt() < 0) { - ret = errno; - suspend_error("Could not lock the terminal."); - goto Restore_console; + if (vt_fd >= 0) { + if (lock_vt() < 0) { + ret = errno; + suspend_error("Could not lock the terminal."); + goto Restore_console; + } } splash.progress(5); @@ -2547,10 +2559,12 @@ int main(int argc, char *argv[]) set_swappiness(orig_swappiness); close_swappiness(); - unlock_vt(); + if (vt_fd >= 0) + unlock_vt(); Restore_console: splash.finish(); - restore_console(vt_fd, orig_vc); + if (vt_fd >= 0) + restore_console(vt_fd, orig_vc); Close_snapshot_fd: close(snapshot_fd); Close_resume_fd: ++++++ suspend-dont-exclude-s390.patch ++++++ Index: suspend-utils-1.0/configure.ac =================================================================== --- suspend-utils-1.0.orig/configure.ac +++ suspend-utils-1.0/configure.ac @@ -131,11 +131,13 @@ if test "${enable_create_device}" = "yes test -z "${MKNOD}" && AC_MSG_ERROR([mknod required for creating devices]) fi +echo "host: ${host}" case "${host}" in i?86-*) ARCH="x86";; x86_*-*) ARCH="x86";; ppc-*|powerpc-*) ARCH="ppc";; ppc64-*|powerpc64-*) ARCH="ppc";; + s390*) ARCH="ppc";; esac CONFIG_FEATURES="" ++++++ suspend-ignore-acpi-video-flags-not-available.patch ++++++ Index: suspend-utils-1.0/s2ram-x86.c =================================================================== --- suspend-utils-1.0.orig/s2ram-x86.c +++ suspend-utils-1.0/s2ram-x86.c @@ -61,8 +61,8 @@ static int set_acpi_video_mode(int mode) unsigned long acpi_video_flags; 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; + printf("/proc/sys/kernel/acpi_video_flags does not exist; ignoring\n"); + return S2RAM_OK; } /* read the old setting from /proc */ if (fscanf(f, "%ld", &acpi_video_flags) != 1) { ++++++ whitelist_ibm_iplex_dx360_s2ram.patch ++++++ --- whitelist.c | 3 +++ 1 file changed, 3 insertions(+) Index: suspend-utils-1.0/whitelist.c =================================================================== --- suspend-utils-1.0.orig/whitelist.c +++ suspend-utils-1.0/whitelist.c @@ -1285,6 +1285,8 @@ struct machine_entry whitelist[] = { { "IBM", " ", "ThinkPad X40", "1UETD2WW*", 0 }, /* X41 Tablet, tested by Danny Kukawka */ { "IBM", "", "ThinkPad X41 Tablet", "", S3_BIOS|S3_MODE }, + /* Srivatsa S. Bhat <[email protected]> */ + { "IBM", "IBM System X iDataPlex dx360 M4*", "", "", VBE_SAVE|VBE_POST|VBE_MODE }, /* Andrey Melentyev <[email protected]> */ { "Infomash", "RoverBook", "", "", VBE_POST|VBE_MODE }, /* Christian Beier <[email protected]> */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
