aboutsummaryrefslogtreecommitdiff
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:33:57 -0800
commit7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67 (patch)
tree08d5802c79bedef93e82d55916da5173ce752dd4
parenta441306ce9de4ca1cc07dfb8aa330e8d6d67e651 (diff)
downloadopenembedded-core-7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67.zip
openembedded-core-7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67.tar.gz
openembedded-core-7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67.tar.bz2
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>
-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 e68ad54..ec44c80 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 <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 =