starlingx/integ
Code Issues Proposed changes

de-fuzz watchdog patch

Browse Source 
With rpm version < 4.13, patch cmd will create .orig file for fuzzy
patch in default. And this .orig file may lead to rpmbuild failure
"error: Installed (but unpackaged) file(s) found:"

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Story: 2003917
Task: 26967

Change-Id: Icde287542cb6aed2f2d3c25ba1dc475597f05329
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-10-09 22:59:02 +08:00
parent 54ce4e46c0
commit 884e2563d3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/watchdog/files/fix-ping-failure.patch
View File

@ -1,5 +1,5 @@
From 4233b90d468bc9e0eb975d96eb69a72ec30cabda Mon Sep 17 00:00:00 2001 From 6623991e7f7f14678e39bf2ed8d16ed36fbe07d4 Mon Sep 17 00:00:00 2001
From: Roy.Li <rongqing.li@windriver.com> From: "Roy.Li" <rongqing.li@windriver.com>
Date: Wed, 1 Jun 2016 11:12:48 -0400 Date: Wed, 1 Jun 2016 11:12:48 -0400
Subject: watchdog: Fix ping mode failure Subject: watchdog: Fix ping mode failure
@ -36,7 +36,7 @@ Signed-off-by: Nam Ninh <nam.ninh@windriver.com>
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/watchdog.c b/src/watchdog.c diff --git a/src/watchdog.c b/src/watchdog.c
index 6f93de8..33ba528 100644 index bab7f82..e24c947 100644
--- a/src/watchdog.c --- a/src/watchdog.c
+++ b/src/watchdog.c +++ b/src/watchdog.c
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
@ -47,7 +47,7 @@ index 6f93de8..33ba528 100644
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <string.h> #include <string.h>
@@ -567,6 +568,8 @@ int main(int argc, char *const argv[]) @@ -573,6 +574,8 @@ int main(int argc, char *const argv[])
pid_t child_pid; pid_t child_pid;
int oom_adjusted = 0; int oom_adjusted = 0;
struct stat s; struct stat s;
@ -56,7 +56,7 @@ index 6f93de8..33ba528 100644
#if USE_SYSLOG #if USE_SYSLOG
char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:"; char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:";
@@ -703,7 +706,7 @@ int main(int argc, char *const argv[]) @@ -709,7 +712,7 @@ int main(int argc, char *const argv[])
perror(progname); perror(progname);
exit(1); exit(1);
} }
@ -66,5 +66,5 @@ index 6f93de8..33ba528 100644
(void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold)); (void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));
-- --
1.8.3.1 2.7.4