summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-06-13 15:58:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:07:57 +0100
commit1e703e1b05b6a8938211a6fbf40cf1f8eb2e3393 (patch)
tree56629f86ed23fab4bed618919b762dfb6384b139
parentd3f43632236cc0750c00702a9a60b81873e0e348 (diff)
downloadpoky-1e703e1b05b6a8938211a6fbf40cf1f8eb2e3393.tar.gz
watchdog: remove the useless watchdog-conf.patch
This patch modifies watchdog.conf file. But this file is deliberately deleted in do_install. The current mechanism in OE is to use another recipe watchdog-conf to handle watchdog configuration. So the patch is really useless. (From OE-Core rev: 80638247143b15a5643f9fcc116d7bc7dcbf3496) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch16
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.15.bb1
2 files changed, 0 insertions, 17 deletions
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
deleted file mode 100644
index ec44c803b1..0000000000
--- a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Signed-off-by: Diego Rondini <diego.ml@zoho.com>
2Upstream-Status: Inappropriate
3
4Index: watchdog-5.15/watchdog.conf
5===================================================================
6--- watchdog-5.15.orig/watchdog.conf
7+++ watchdog-5.15/watchdog.conf
8@@ -28,7 +28,7 @@
9 #retry-timeout = 60
10 #repair-maximum = 1
11
12-#watchdog-device = /dev/watchdog
13+watchdog-device = /dev/watchdog
14
15 # Defaults compiled into the binary
16 #temperature-sensor =
diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb
index 24791c4170..d3f03532ac 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.15.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb
@@ -12,7 +12,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
12 file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ 12 file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \
13 file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ 13 file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \
14 file://watchdog-init.patch \ 14 file://watchdog-init.patch \
15 file://watchdog-conf.patch \
16 file://wd_keepalive.init \ 15 file://wd_keepalive.init \
17" 16"
18 17