From d8de33b0c2a943b01e68b5c5f8148651f597b90b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Nov 2017 16:45:43 +0000 Subject: 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. (From OE-Core rev: 7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-extended/watchdog/watchdog/watchdog-conf.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch index e68ad545c3..ec44c803b1 100644 --- 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 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 = -- cgit v1.2.3-54-g00ecf