aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/apmd/apmd-3.2.2/workaround.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/apmd/apmd-3.2.2/workaround.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/apmd/apmd-3.2.2/workaround.patch')
-rw-r--r--recipes/apmd/apmd-3.2.2/workaround.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/recipes/apmd/apmd-3.2.2/workaround.patch b/recipes/apmd/apmd-3.2.2/workaround.patch
new file mode 100644
index 0000000000..19cf073115
--- /dev/null
+++ b/recipes/apmd/apmd-3.2.2/workaround.patch
@@ -0,0 +1,55 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- apmd-3.2.2.orig/apmd.c~workaround.patch
++++ apmd-3.2.2.orig/apmd.c
+@@ -158,6 +158,7 @@
+ static int quiet_bios_batlow; /* = 0 */
+ static int verbosity = DEFAULT_VERBOSITY;
+ static int warn_level = 10;
++static int sleep_now = 0; /* ntp */
+
+ static uid_t apmd_uid = 0;
+ static int apmd_fd = -1;
+@@ -942,6 +943,12 @@
+ exit(0);
+ }
+
++/* ntp */
++static void sig_usr1(int sig)
++{
++ sleep_now = 1;
++}
++
+ int main(int argc, char **argv)
+ {
+ int c;
+@@ -1151,6 +1158,8 @@
+ openlog("apmd", (verbosity>=LOG_DEBUG)?LOG_PERROR:0 | LOG_PID | LOG_CONS, LOG_DAEMON);
+
+ /* Set up signal handler */
++ if (signal(SIGUSR1, SIG_IGN) != SIG_IGN)
++ signal(SIGUSR1, sig_usr1); /* ntp */
+ if (signal(SIGINT, SIG_IGN) != SIG_IGN)
+ signal(SIGINT, sig_handler);
+ if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
+@@ -1230,9 +1239,16 @@
+
+ for (;;)
+ {
+- int num_events = apm_get_events(apmd_fd, check_interval, events, MAX_EVENTS);
++ int num_events;
+ int e, a;
+
++ /* ntp */
++ if (sleep_now) {
++ sleep_now = 0;
++ handle_event(APM_USER_SUSPEND, &apminfo);
++ }
++
++ num_events = apm_get_events(apmd_fd, check_interval, events, MAX_EVENTS);
+ apm_read(&apminfo);
+
+ if (num_events == 0) {