| Message ID | 20180305172046.21729-19-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | 7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67 |
| Headers | show
Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2934735lja; Mon, 5 Mar 2018 09:23:30 -0800 (PST) X-Google-Smtp-Source: AG47ELtT2rmCFWWdctv0X6w95cnHnLFcMihBjReVUj83I6EhsuFeAZmy26/9MUKsRvkYnPBZJhzP X-Received: by 2002:a17:902:6a89:: with SMTP id n9-v6mr3484472plk.51.1520270609879; Mon, 05 Mar 2018 09:23:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520270609; cv=none; d=google.com; s=arc-20160816; b=AoYomiolYHtH7vZq5vAdCAfIdnQ6T1Iw+GBK5z9pAHPTWmxabOiYVuegCmAtyHvoU8 P37WJJM/STK9hUtt4eiBXQYvHIhKp/SG0qie5AuQE3tcZe92fEuR4kQMXURVsPvVtkHf HapwpcnomXr0CeMktSSPK/hHhN/YZC1+LGrCWfnyB2O7viB2Tm13HZBKOrNucrNGnG1K ROx6ACs64TLpQhjKlqRu7ZABAw+pCvh/zRiAv4c6kX66AX740iFBsHtXKJ4IQjojRweP TTuqLanDV5x5Zco4PIL50CqI5gCycWUEgCAu1TTaWhqwmYtZFlVU9s9u7X4XFawV//Uc UkPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=JPNKHO6wXzMqvadSRRLhXmci9imbLejcdbno2GbhSYU=; b=1GOrbwwtKjbDfQ1NORS2GW4cZ6sDGBLDfy8aphRet89hYNErbUFYhat5DC4dibSZRo lPmAzZMVj3Xfz6PjbDjeX41FgZ+2Ah+nXBElCb1BkAFvvv3spE83V1WLxHf3YCfwhUZs oootcOpxPyOO771S/xFD1L9T9M3wg8mJNF0FPEyQwIsI48+e5fEim22TQ09YJpjaSH1O jVscFz5evyHJ3prg/GnRzMC+zQpSMcZbkEuW/vdIwkNUkBKYr0LI0b2iHrPF2aAzinSW kyy6X107FpWe50XA9F4ZvLul80Cb57JsqQ9jtjCcrRKipvhS0rSyRjK/Nwh6fLbbggVV T76A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=ou5/SyVF; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: <openembedded-core-bounces@lists.openembedded.org> Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y96-v6si9634530plh.796.2018.03.05.09.23.29; Mon, 05 Mar 2018 09:23:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=ou5/SyVF; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 26CF478AFE; Mon, 5 Mar 2018 17:21:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by mail.openembedded.org (Postfix) with ESMTP id B1B8E78AA0 for <openembedded-core@lists.openembedded.org>; Mon, 5 Mar 2018 17:21:09 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id p104so18081382wrc.12 for <openembedded-core@lists.openembedded.org>; Mon, 05 Mar 2018 09:21:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=WsQHlqrlLvu2wRnxsNV5fmExn/pugLcP1R/3A+qVpEU=; b=ou5/SyVFXvwNy1uyruZcpfONXc3FsC5uS7DW0kduEB9vYG7sUAB3wbmNzy9KFxGjIr vJJ+X7CIUTVrpxmJ0dKAlgBxuXbzgIcru1qGcXiYZxXKOwUORFmNJ/p9gUIQCmpWCMK7 0qlVmp/Lfq7axGt20mzb3scsp7ovk5/IfI5lWLDfQqwqQZpvEeRPP5w4jNrcVGZsAYl6 EzfPvriDCkX8RADb9Q6r4WyXYEU151xTP/7uxHPBW88iKSEOyH1DfJOHhwzqpp9sxZkY 6J4nrdYBdCTIepNZhyibo0AR5/PjoJ+Rhqg85fnJ2PSKnIEiAVsRBcriwYoEQlVpXj3A urcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=WsQHlqrlLvu2wRnxsNV5fmExn/pugLcP1R/3A+qVpEU=; b=PaRm1th3+3NGl1k2fUVGOLtao+9wCkWCM0U8BvXbNQgO80L9zzk9oIb/62u+6LA2RQ zBAATeD6z6vTFczVEujKcAzZXSmGJxoqvc5ItlHnr5i87AjHJeKWqL6ruVVobxIEn1r2 qBHkeilAlJB3ErIMWwp77UTQW2lLIiLhA6UH+pRTZFbKuK/ssiLtoIVI8ITNSR9ZtWMb dnXE0Bh+bKTeAtecfElGbUAUoTQ7oJI5rYIQY6OiK7DZWmfJIUZ4QyVb90pJTwIiQTy7 lRYWG2RvrhDUKpCfXnIaFHmTrDno47FHAVhFvp5CURkOSS16kuASfDqsGPZa7H9D0TUm KCTw== X-Gm-Message-State: APf1xPB3i26Mp5faCblavy5Fy7dDCFVkkIlPGU36a9/d+h+DG8EnK80q 28SGtjs407BvByph6CR/gkv0e4kf X-Received: by 10.223.209.197 with SMTP id m5mr13373648wri.121.1520270470557; Mon, 05 Mar 2018 09:21:10 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id m190sm10082047wmb.6.2018.03.05.09.21.09 for <openembedded-core@lists.openembedded.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 09:21:09 -0800 (PST) From: Ross Burton <ross.burton@intel.com> To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 17:20:36 +0000 Message-Id: <20180305172046.21729-19-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180305172046.21729-1-ross.burton@intel.com> References: <20180305172046.21729-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 19/29] watchdog: refresh patches X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer <openembedded-core.lists.openembedded.org> List-Unsubscribe: <http://lists.openembedded.org/mailman/options/openembedded-core>, <mailto:openembedded-core-request@lists.openembedded.org?subject=unsubscribe> List-Archive: <http://lists.openembedded.org/pipermail/openembedded-core/> List-Post: <mailto:openembedded-core@lists.openembedded.org> List-Help: <mailto:openembedded-core-request@lists.openembedded.org?subject=help> List-Subscribe: <http://lists.openembedded.org/mailman/listinfo/openembedded-core>, <mailto:openembedded-core-request@lists.openembedded.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org |
| Series |
[01/29] dbus: remove upstreamed patch
|
expand
|
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch index e68ad545c30..ec44c803b14 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 =
Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../recipes-extended/watchdog/watchdog/watchdog-conf.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core