summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/watchdog/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-03-11 22:32:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:04 +0000
commitbc7bbe9df753550a91da06ec32721efbe4880e88 (patch)
tree2ae53c3d71e26e43ec423a6cf942b5a37c01e7eb /meta/recipes-extended/watchdog/files
parent64b43acb6cf67a8478e4201e4a15835e37d9888a (diff)
downloadpoky-bc7bbe9df753550a91da06ec32721efbe4880e88.tar.gz
watchdog: Upgrade 5.12 -> 5.13
Part of ping failure patch is already applied in 5.13 hence refreshed the patch. Tested on x86_64 box (From OE-Core rev: 1834400555d0e2bad73ee472d5991464fec70d53) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/watchdog/files')
-rw-r--r--meta/recipes-extended/watchdog/files/fix-ping-failure.patch21
1 files changed, 6 insertions, 15 deletions
diff --git a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch b/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
index c6ee84345e..f5976eb5cf 100644
--- a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
+++ b/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
@@ -33,19 +33,10 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
33 src/watchdog.c | 5 ++++- 33 src/watchdog.c | 5 ++++-
34 2 files changed, 5 insertions(+), 2 deletions(-) 34 2 files changed, 5 insertions(+), 2 deletions(-)
35 35
36--- a/src/net.c 36Index: watchdog-5.13/src/watchdog.c
37+++ b/src/net.c 37===================================================================
38@@ -118,7 +118,7 @@ int check_net(char *target, int sock_fp, 38--- watchdog-5.13.orig/src/watchdog.c 2013-02-01 03:15:44.000000000 -0800
39 dtimeout.tv_usec -= 1000000; 39+++ watchdog-5.13/src/watchdog.c 2013-03-11 22:27:48.741657881 -0700
40 dtimeout.tv_sec++;
41 }
42- if (dtimeout.tv_sec <= 0)
43+ if (dtimeout.tv_sec < 0)
44 break;
45 #if USE_SYSLOG
46 if (verbose && logtick && ticker == 1)
47--- a/src/watchdog.c
48+++ b/src/watchdog.c
49@@ -28,6 +28,7 @@ 40@@ -28,6 +28,7 @@
50 #include <sys/types.h> 41 #include <sys/types.h>
51 #include <sys/ioctl.h> 42 #include <sys/ioctl.h>
@@ -54,7 +45,7 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
54 #include <linux/watchdog.h> 45 #include <linux/watchdog.h>
55 #include <string.h> 46 #include <string.h>
56 47
57@@ -567,6 +568,8 @@ int main(int argc, char *const argv[]) 48@@ -567,6 +568,8 @@
58 pid_t child_pid; 49 pid_t child_pid;
59 int oom_adjusted = 0; 50 int oom_adjusted = 0;
60 struct stat s; 51 struct stat s;
@@ -63,7 +54,7 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
63 54
64 #if USE_SYSLOG 55 #if USE_SYSLOG
65 char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:"; 56 char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:";
66@@ -703,7 +706,7 @@ int main(int argc, char *const argv[]) 57@@ -703,7 +706,7 @@
67 perror(progname); 58 perror(progname);
68 exit(1); 59 exit(1);
69 } 60 }