[oe-commits] [openembedded-core] 03/53: watchdog: remove the useless watchdog-conf.patch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 42e77f2fe7da7685a8356b019b91c3b0b41f6752
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Wed Jun 13 15:58:20 2018 +0800

    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 <Qi.Chen at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../watchdog/watchdog/watchdog-conf.patch                | 16 ----------------
 meta/recipes-extended/watchdog/watchdog_5.15.bb          |  1 -
 2 files changed, 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 ec44c80..0000000
--- a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Signed-off-by: Diego Rondini <diego.ml at zoho.com>
-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 24791c4..d3f0353 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 \
 "
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.