diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sys-power/upower/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'sys-power/upower/files')
| -rw-r--r-- | sys-power/upower/files/upower-0.99.4-copy-paste.patch | 28 | ||||
| -rw-r--r-- | sys-power/upower/files/upower-0.99.4-timer-stats.patch | 42 |
2 files changed, 70 insertions, 0 deletions
diff --git a/sys-power/upower/files/upower-0.99.4-copy-paste.patch b/sys-power/upower/files/upower-0.99.4-copy-paste.patch new file mode 100644 index 000000000000..6afe9b7a9831 --- /dev/null +++ b/sys-power/upower/files/upower-0.99.4-copy-paste.patch @@ -0,0 +1,28 @@ +From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Tue, 23 Feb 2016 09:51:07 +0100 +Subject: daemon: fix get_critical_action() + +Fix copy&paste error from e7e9156f that called the wrong _complete_ function +for up_daemon_get_critical_action(). + +https://bugs.freedesktop.org/show_bug.cgi?id=94262 + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index be14cbe..e95f904 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, + GDBusMethodInvocation *invocation, + UpDaemon *daemon) + { +- up_exported_daemon_complete_get_display_device (skeleton, invocation, +- up_backend_get_critical_action (daemon->priv->backend)); ++ up_exported_daemon_complete_get_critical_action (skeleton, invocation, ++ up_backend_get_critical_action (daemon->priv->backend)); + return TRUE; + } + +-- +cgit v0.10.2 + diff --git a/sys-power/upower/files/upower-0.99.4-timer-stats.patch b/sys-power/upower/files/upower-0.99.4-timer-stats.patch new file mode 100644 index 000000000000..2ac44205459d --- /dev/null +++ b/sys-power/upower/files/upower-0.99.4-timer-stats.patch @@ -0,0 +1,42 @@ +From 798588a480eaae50368bed75fc78f8314523b2a3 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Sun, 23 Apr 2017 20:22:02 +0100 +Subject: Do not spin in a loop when /proc/timer_stats cannot be written + +Only set up the polling once the write has succeeded. + +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100626 + +diff --git a/src/up-wakeups.c b/src/up-wakeups.c +index 1bc3c7b..99433dd 100644 +--- a/src/up-wakeups.c ++++ b/src/up-wakeups.c +@@ -626,6 +626,13 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups) + + g_debug ("enabling timer stats"); + ++ /* enable timer stats */ ++ file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w"); ++ if (file == NULL) ++ return FALSE; ++ fprintf (file, "1\n"); ++ fclose (file); ++ + /* setup polls */ + wakeups->priv->poll_kernel_id = + g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_KERNEL, +@@ -637,11 +644,6 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups) + (GSourceFunc) up_wakeups_poll_userspace_cb, wakeups); + g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[upower] up_wakeups_poll_userspace_cb"); + +- file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w"); +- if (file == NULL) +- return FALSE; +- fprintf (file, "1\n"); +- fclose (file); + wakeups->priv->polling_enabled = TRUE; + return TRUE; + } +-- +cgit v0.10.2 + |