From 884e2563d36064cca54634235df4a9490bdcddcb Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 9 Oct 2018 22:59:02 +0800 Subject: [PATCH] de-fuzz watchdog patch 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 --- base/watchdog/files/fix-ping-failure.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/watchdog/files/fix-ping-failure.patch b/base/watchdog/files/fix-ping-failure.patch index 230e1731d..42d9356a1 100644 --- a/base/watchdog/files/fix-ping-failure.patch +++ b/base/watchdog/files/fix-ping-failure.patch @@ -1,5 +1,5 @@ -From 4233b90d468bc9e0eb975d96eb69a72ec30cabda Mon Sep 17 00:00:00 2001 -From: Roy.Li +From 6623991e7f7f14678e39bf2ed8d16ed36fbe07d4 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" Date: Wed, 1 Jun 2016 11:12:48 -0400 Subject: watchdog: Fix ping mode failure @@ -36,7 +36,7 @@ Signed-off-by: Nam Ninh 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/watchdog.c b/src/watchdog.c -index 6f93de8..33ba528 100644 +index bab7f82..e24c947 100644 --- a/src/watchdog.c +++ b/src/watchdog.c @@ -28,6 +28,7 @@ @@ -47,7 +47,7 @@ index 6f93de8..33ba528 100644 #include #include -@@ -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; int oom_adjusted = 0; struct stat s; @@ -56,7 +56,7 @@ index 6f93de8..33ba528 100644 #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[]) +@@ -709,7 +712,7 @@ int main(int argc, char *const argv[]) perror(progname); exit(1); } @@ -66,5 +66,5 @@ index 6f93de8..33ba528 100644 (void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold)); -- -1.8.3.1 +2.7.4