summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:45:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commitd8de33b0c2a943b01e68b5c5f8148651f597b90b (patch)
tree339be2fa4118631ce43457b3229f898b316fda7e /meta
parent8a21fa144c02fa66dd6592f8eed6ce572b1c6a48 (diff)
downloadpoky-d8de33b0c2a943b01e68b5c5f8148651f597b90b.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch14
1 files changed, 8 insertions, 6 deletions
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 @@
1Signed-off-by: Diego Rondini <diego.ml@zoho.com> 1Signed-off-by: Diego Rondini <diego.ml@zoho.com>
2Upstream-Status: Inappropriate 2Upstream-Status: Inappropriate
3 3
4--- watchdog-5.13.orig/watchdog.conf 2013-02-01 12:15:44.000000000 +0100 4Index: watchdog-5.15/watchdog.conf
5+++ watchdog-5.13/watchdog.conf 2014-11-13 10:59:43.233943000 +0100 5===================================================================
6@@ -20,7 +20,7 @@ 6--- watchdog-5.15.orig/watchdog.conf
7 #test-binary = 7+++ watchdog-5.15/watchdog.conf
8 #test-timeout = 8@@ -28,7 +28,7 @@
9 #retry-timeout = 60
10 #repair-maximum = 1
9 11
10-#watchdog-device = /dev/watchdog 12-#watchdog-device = /dev/watchdog
11+watchdog-device = /dev/watchdog 13+watchdog-device = /dev/watchdog
12 14
13 # Defaults compiled into the binary 15 # Defaults compiled into the binary
14 #temperature-device = 16 #temperature-sensor =