diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-power/thermald/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-power/thermald/files')
-rw-r--r-- | sys-power/thermald/files/thermald | 19 | ||||
-rw-r--r-- | sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch | 65 |
2 files changed, 84 insertions, 0 deletions
diff --git a/sys-power/thermald/files/thermald b/sys-power/thermald/files/thermald new file mode 100644 index 000000000000..73643a27a686 --- /dev/null +++ b/sys-power/thermald/files/thermald @@ -0,0 +1,19 @@ +#!/sbin/runscript + +depend() { + need dbus + after logger +} + +start() { + ebegin "Starting thermald" + + start-stop-daemon --start --quiet --name thermald --exec /usr/sbin/thermald -- --dbus-enable + eend $? +} + +stop() { + ebegin "Stopping thermald" + /usr/bin/dbus-send --system --dest=org.freedesktop.thermald /org/freedesktop/thermald org.freedesktop.thermald.Terminate + eend $? +} diff --git a/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch b/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch new file mode 100644 index 000000000000..96ba91ffe5ec --- /dev/null +++ b/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch @@ -0,0 +1,65 @@ +commit 14bf458675a735975c6b9bf7394682e93398a8e0 +Author: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> +Date: Tue Jul 14 17:46:45 2015 -0700 + + Fix regression in exit via dbus message + + Terminate via dbus terminate message is broken. Fixed this. + Thanks to Yixun Lan <yixun.lan@gmail.com> for finding this. + +diff --git a/src/main.cpp b/src/main.cpp +index 2cf4864..d692cf3 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -50,7 +50,7 @@ + #define TD_DIST_VERSION PACKAGE_VERSION + #endif + +-extern int thd_dbus_server_init(); ++extern int thd_dbus_server_init(void (*exit_handler)(int)); + + // Default log level + static int thd_log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL +@@ -263,7 +263,7 @@ int main(int argc, char *argv[]) { + } + + if (dbus_enable) +- thd_dbus_server_init(); ++ thd_dbus_server_init(sig_int_handler); + + if (!no_daemon) { + printf("Ready to serve requests: Daemonizing.. %d\n", thd_daemonize); +diff --git a/src/thd_dbus_interface.cpp b/src/thd_dbus_interface.cpp +index 021bce2..7926101 100644 +--- a/src/thd_dbus_interface.cpp ++++ b/src/thd_dbus_interface.cpp +@@ -187,8 +187,12 @@ gboolean thd_dbus_interface_get_current_preference(PrefObject *obj, + return TRUE; + } + ++void (*thd_dbus_exit_callback)(int); + gboolean thd_dbus_interface_terminate(PrefObject *obj, GError **error) { + thd_engine->thd_engine_terminate(); ++ if (thd_dbus_exit_callback) ++ thd_dbus_exit_callback(0); ++ + return TRUE; + } + +@@ -561,13 +565,15 @@ gboolean thd_dbus_interface_get_sensor_temperature(PrefObject *obj, int index, + } + + // Setup dbus server +-int thd_dbus_server_init() { ++int thd_dbus_server_init(void (*exit_handler)(int)) { + DBusGConnection *bus; + DBusGProxy *bus_proxy; + GError *error = NULL; + guint result; + PrefObject *value_obj; + ++ thd_dbus_exit_callback = exit_handler; ++ + bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + if (error != NULL) { + thd_log_error("Couldn't connect to session bus: %s:\n", error->message); |