watchdog: refresh patches

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
index e68ad545c308306336c8d7a710bf8c196957ab75..ec44c803b140866488900138ea90339aa6cafe95 100644 (file)
--- a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
@@ -1,14 +1,16 @@
 Signed-off-by: Diego Rondini <diego.ml@zoho.com>
 Upstream-Status: Inappropriate
 
---- watchdog-5.13.orig/watchdog.conf   2013-02-01 12:15:44.000000000 +0100
-+++ watchdog-5.13/watchdog.conf        2014-11-13 10:59:43.233943000 +0100
-@@ -20,7 +20,7 @@
- #test-binary          = 
- #test-timeout         = 
+Index: watchdog-5.15/watchdog.conf
+===================================================================
+--- watchdog-5.15.orig/watchdog.conf
++++ watchdog-5.15/watchdog.conf
+@@ -28,7 +28,7 @@
+ #retry-timeout                = 60
+ #repair-maximum               = 1
  
 -#watchdog-device      = /dev/watchdog
 +watchdog-device       = /dev/watchdog
  
  # Defaults compiled into the binary
- #temperature-device   =
+ #temperature-sensor   =