From 80638247143b15a5643f9fcc116d7bc7dcbf3496 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 13 Jun 2018 15:58:20 +0800 Subject: 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. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- .../watchdog/watchdog/watchdog-conf.patch | 16 ---------------- meta/recipes-extended/watchdog/watchdog_5.15.bb | 1 - 2 files changed, 17 deletions(-) delete mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch (limited to 'meta/recipes-extended/watchdog') 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 @@ -Signed-off-by: Diego Rondini -Upstream-Status: Inappropriate - -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-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 \ file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ file://watchdog-init.patch \ - file://watchdog-conf.patch \ file://wd_keepalive.init \ " -- cgit 1.2.3-korg