diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-11-06 16:19:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-09 10:17:04 +0000 |
commit | fb2e1fd7d2df68d02f5da7dbf4390ea03e7eafdb (patch) | |
tree | e8f8bac3f58e1cf13b2f5b27ca25654ae721e705 /meta/recipes-extended/watchdog/watchdog | |
parent | f16573362398efc8d340024d749c30a8043db0f5 (diff) | |
download | openembedded-core-contrib-fb2e1fd7d2df68d02f5da7dbf4390ea03e7eafdb.tar.gz |
watchdog: Upgrade to 5.14
Move the patches from generic files to watchdog
Rebased the fix-ping due to code reorg on the source
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/watchdog')
-rw-r--r-- | meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch | 79 | ||||
-rw-r--r-- | meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch | 27 |
2 files changed, 106 insertions, 0 deletions
diff --git a/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch new file mode 100644 index 0000000000..14ab9c56ab --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch @@ -0,0 +1,79 @@ +Fix ping mode failure + +Upstream-Status: Pending + +When watchdog works on ping mode, the system will be rebooted since +watchdog can not receive the expected ECOREPLY on a setting interval. + +Ping mode uses a raw socket to send a ECO packet, then uses select() +to wait and recvfrom() to receive the ECOREPLY packet, if select() +shows the data is ready, and the data is not the expected ECOREPLY, +and waiting time is not overdue, it will continue use select() and +recvfrom(). + +Problem is that the raw socket can receive any icmp packets, if we do +not set filters, and there are many icmp packets on socket, this +program will not find its interested ECOREPLY packet in a special +interval, which makes the ping mode fail. + + +Other program is that watchdog sometime can not reach the call of +recvfrom to try to receive packets since tv_sec of struct timeval +of select parameter is 0. + +The timeout of select() is the result of ping interval minusing the +time of calling gettimeofday spending, when ping interval is 1 second, +and the call of gettimeofday() spends several useconds, the tv_sec of +struct timeval of select parameter must be 0, at that condition, we +should it is valid of tv_sec of struct timeval of select parameter be 0 + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> +--- + src/net.c | 2 +- + src/watchdog.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +Index: watchdog-5.14/src/watchdog.c +=================================================================== +--- 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> ++#include <linux/icmp.h> + #include <linux/watchdog.h> + #include <string.h> + +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)); + diff --git a/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch b/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch new file mode 100644 index 0000000000..2fad3a112f --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch @@ -0,0 +1,27 @@ +Fix out of tree build support: + +| installing /etc/watchdog.conf +| /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5' +| /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8' +| /usr/bin/install -c -m 644 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/watchdog.conf.5 '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5' +| /usr/bin/install -c -m 644 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/watchdog.8 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/wd_keepalive.8 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/wd_identify.8 '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8' +| /usr/bin/install: cannot stat `watchdog.conf': No such file or directory +| make[2]: *** [install-etc-local] Error 1 + +Upstream-Status: Pending + +RP 2013/03/21 + +Index: watchdog-5.13/Makefile.am +=================================================================== +--- watchdog-5.13.orig/Makefile.am 2013-02-01 11:15:44.000000000 +0000 ++++ watchdog-5.13/Makefile.am 2013-03-21 11:59:35.637139031 +0000 +@@ -16,7 +16,7 @@ + else \ + echo "installing $(CONFIG_FILENAME)"; \ + $(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ +- $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ ++ $(INSTALL_DATA) $(srcdir)/watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ + fi + + install-data-local: install-etc-local |