Patchwork watchdog: Upgrade 5.12 -> 5.13

login
register
mail settings
Submitter Khem Raj
Date March 12, 2013, 5:32 a.m.
Message ID <1363066365-8060-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/46023/
State Accepted
Commit 1834400555d0e2bad73ee472d5991464fec70d53
Headers show

Comments

Khem Raj - March 12, 2013, 5:32 a.m.
Part of ping failure patch is already applied
in 5.13 hence refreshed the patch.
Tested on x86_64 box

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../watchdog/files/fix-ping-failure.patch          |   21 ++++++--------------
 meta/recipes-extended/watchdog/watchdog_5.12.bb    |   21 --------------------
 meta/recipes-extended/watchdog/watchdog_5.13.bb    |   18 +++++++++++++++++
 3 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-extended/watchdog/watchdog_5.12.bb
 create mode 100644 meta/recipes-extended/watchdog/watchdog_5.13.bb

Patch

diff --git a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch b/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
index c6ee843..f5976eb 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>
  src/watchdog.c |    5 ++++-
  2 files changed, 5 insertions(+), 2 deletions(-)
 
---- a/src/net.c
-+++ b/src/net.c
-@@ -118,7 +118,7 @@ int check_net(char *target, int sock_fp,
- 		    dtimeout.tv_usec -= 1000000;
- 		    dtimeout.tv_sec++;
- 		}
--		if (dtimeout.tv_sec <= 0)
-+		if (dtimeout.tv_sec < 0)
- 		    break;
- #if USE_SYSLOG
- 		if (verbose && logtick && ticker == 1)
---- a/src/watchdog.c
-+++ b/src/watchdog.c
+Index: watchdog-5.13/src/watchdog.c
+===================================================================
+--- watchdog-5.13.orig/src/watchdog.c	2013-02-01 03:15:44.000000000 -0800
++++ watchdog-5.13/src/watchdog.c	2013-03-11 22:27:48.741657881 -0700
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  #include <sys/ioctl.h>
@@ -54,7 +45,7 @@  Signed-off-by: Roy.Li <rongqing.li@windriver.com>
  #include <linux/watchdog.h>
  #include <string.h>
  
-@@ -567,6 +568,8 @@ int main(int argc, char *const argv[])
+@@ -567,6 +568,8 @@
      pid_t child_pid;
      int oom_adjusted = 0;
      struct stat s;
@@ -63,7 +54,7 @@  Signed-off-by: Roy.Li <rongqing.li@windriver.com>
  
  #if USE_SYSLOG
      char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:";
-@@ -703,7 +706,7 @@ int main(int argc, char *const argv[])
+@@ -703,7 +706,7 @@
  		perror(progname);
  		exit(1);
  	    }
diff --git a/meta/recipes-extended/watchdog/watchdog_5.12.bb b/meta/recipes-extended/watchdog/watchdog_5.12.bb
deleted file mode 100644
index 78262b8..0000000
--- a/meta/recipes-extended/watchdog/watchdog_5.12.bb
+++ /dev/null
@@ -1,21 +0,0 @@ 
-SUMMARY = "Software watchdog"
-DESCRIPTION = "Watchdog is a daemon that checks if your system is still \
-working. If programs in user space are not longer executed \
-it will reboot the system."
-HOMEPAGE = "http://watchdog.sourceforge.net/"
-BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194"
-
-LICENSE = "GPL-2.0+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
-	   file://fix-ping-failure.patch"
-
-SRC_URI[md5sum] = "cea28bea70e54f3625062bc808aef9af"
-SRC_URI[sha256sum] = "862d5da6ab34568bbd4ea695316f063fecabe107d0939ceea6c67c9ec0b1a08e"
-
-inherit autotools
-
-RRECOMMENDS_${PN} = "kernel-module-softdog"
diff --git a/meta/recipes-extended/watchdog/watchdog_5.13.bb b/meta/recipes-extended/watchdog/watchdog_5.13.bb
new file mode 100644
index 0000000..610e473
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog_5.13.bb
@@ -0,0 +1,18 @@ 
+SUMMARY = "Software watchdog"
+DESCRIPTION = "Watchdog is a daemon that checks if your system is still \
+working. If programs in user space are not longer executed \
+it will reboot the system."
+HOMEPAGE = "http://watchdog.sourceforge.net/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194"
+
+LICENSE = "GPL-2.0+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
+	   file://fix-ping-failure.patch"
+SRC_URI[md5sum] = "153455f008f1cf8f65f6ad9586a21ff1"
+SRC_URI[sha256sum] = "141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0"
+
+inherit autotools
+
+RRECOMMENDS_${PN} = "kernel-module-softdog"