sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

watchdog: Upgrade to 5.14 

Move the patches from generic files to watchdog
Rebased the fix-ping due to code reorg on the source

(From OE-Core rev: fb2e1fd7d2df68d02f5da7dbf4390ea03e7eafdb)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2014-11-06 16:19:44 -08:00 committed by Richard Purdie
parent f5ecb75481
commit c58237560d
3 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-extended/watchdog/files/fix-ping-failure.patch → meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
View File

@ -33,11 +33,11 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com>
src/watchdog.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
Index: watchdog-5.13/src/watchdog.c
Index: watchdog-5.14/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 @@
--- watchdog-5.14.orig/src/watchdog.c
+++ watchdog-5.14/src/watchdog.c
@@ -24,6 +24,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <linux/oom.h>
@ -45,21 +45,35 @@ Index: watchdog-5.13/src/watchdog.c
#include <linux/watchdog.h>
#include <string.h>
@@ -567,6 +568,8 @@
pid_t child_pid;
int oom_adjusted = 0;
struct stat s;
+ struct icmp_filter filt;
+ filt.data = ~(1<<ICMP_ECHOREPLY);
Index: watchdog-5.14/src/net.c
===================================================================
--- watchdog-5.14.orig/src/net.c
+++ watchdog-5.14/src/net.c
@@ -11,7 +11,8 @@
#include <errno.h>
#include <sys/time.h>
#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
+#include <linux/icmp.h>
+//#include <netinet/ip_icmp.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h> /* for gethostname() etc */
@@ -179,6 +180,9 @@ int open_netcheck(struct list *tlist)
{
struct list *act;
int hold = 0;
+ struct icmp_filter filt;
+ filt.data = ~(1<<ICMP_ECHOREPLY);
+
if (tlist != NULL) {
for (act = tlist; act != NULL; act = act->next) {
@@ -202,6 +206,7 @@ int open_netcheck(struct list *tlist)
fatal_error(EX_SYSERR, "error opening socket (%s)", strerror(errno));
}
+ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt));
/* this is necessary for broadcast pings to work */
(void)setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));
#if USE_SYSLOG
char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:";
@@ -703,7 +706,7 @@
perror(progname);
exit(1);
}
-
+ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt));
/* this is necessary for broadcast pings to work */
(void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));

0
meta/recipes-extended/watchdog/files/fixsepbuild.patch → meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
View File

5
meta/recipes-extended/watchdog/watchdog_5.13.bb → meta/recipes-extended/watchdog/watchdog_5.14.bb
View File

@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://fixsepbuild.patch \
file://fix-ping-failure.patch"
SRC_URI[md5sum] = "153455f008f1cf8f65f6ad9586a21ff1"
SRC_URI[sha256sum] = "141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0"
SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
SRC_URI[sha256sum] = "620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1"
inherit autotools