summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/watchdog/files/fix-ping-failure.patch21
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.13.bb (renamed from meta/recipes-extended/watchdog/watchdog_5.12.bb)7
2 files changed, 8 insertions, 20 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 }
diff --git a/meta/recipes-extended/watchdog/watchdog_5.12.bb b/meta/recipes-extended/watchdog/watchdog_5.13.bb
index 78262b80e4..610e4735bb 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.12.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.13.bb
@@ -8,13 +8,10 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194"
8LICENSE = "GPL-2.0+" 8LICENSE = "GPL-2.0+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" 9LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
10 10
11PR = "r1"
12
13SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
14 file://fix-ping-failure.patch" 12 file://fix-ping-failure.patch"
15 13SRC_URI[md5sum] = "153455f008f1cf8f65f6ad9586a21ff1"
16SRC_URI[md5sum] = "cea28bea70e54f3625062bc808aef9af" 14SRC_URI[sha256sum] = "141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0"
17SRC_URI[sha256sum] = "862d5da6ab34568bbd4ea695316f063fecabe107d0939ceea6c67c9ec0b1a08e"
18 15
19inherit autotools 16inherit autotools
20 17