Commit Graph

38 Commits

Author SHA1 Message Date
Khem Raj
fa2cc0b97b watchdog: Include needed system header for function decls
These headers are needed on musl too.

(From OE-Core rev: 9cc6d5760febcafc19739a73a80c49fb3ee393df)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a53722b962e79e0831c0fba24ef7c1cfda24971a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-03 13:09:49 +01:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Richard Purdie
c4baddc0d0 reproducible: Improve SOURCE_DATE_EPOCH_FALLBACK handling
Ensure the fallback value if used is written to the SDE file
and hence stored in sstate, reducing any confusion within the
code over '0' values.

Bump the HASHEQUIV_VERSION since we've had a ton of trouble
with ensuring this rolls out correctly on the autobuilder so
others may too, take a clean slate for it.

(From OE-Core rev: 53ffffa32b76330835287dfc05d4e4796841af08)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-24 00:19:38 +00:00
Richard Purdie
f5c35a5918 watchdog: Avoid reproducibility failures after fixing build
Add some temporary bumps to versions to change the output hash so
the fix applies correctly. Can be dropped next time we update the
recipe and the output changes.

(From OE-Core rev: 69205edcdff865048e55a6b7feaf82064ebc10c5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-16 11:28:17 +00:00
Richard Purdie
d27686b325 watchdog: Fix determinism issue from sendmail host path
The build was injecting the path of the host's sendmail binary. Set
this deterministically to match OE's path for it.

(From OE-Core rev: 476328b91ea4417160580d28df4fcc1147d85ae2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-16 11:28:17 +00:00
Chen Qi
ac1879d33b watchdog: use /run instead of /var/run in systemd service file
/var/run in deprecated by systemd, use /run instead, as suggested by systemd.

(From OE-Core rev: 85c92455eb6a133ae5ce8e70d46cac4fcd55ffe4)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-17 12:34:29 +01:00
Wang Mingyu
7e1b054aed watchdog: upgrade 5.15 -> 5.16
0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
removed since it is included in 5.16

-License-Update: Copyright year updated to 2020.

(From OE-Core rev: 1ec6381bb6b654076ee7eec1d3a8933a160b7811)

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:44 +01:00
Trevor Gamblin
bf4a21e464 watchdog: fix PIDFile path in existing patch
systemd throws a warning about the value of PIDFile:

  systemd[1]: /usr/lib/systemd/system/watchdog.service:11: PIDFile=
    references a path below legacy directory /var/run/, updating
    /var/run/watchdog.pid → /run/watchdog.pid; please update the
    unit file accordingly.

This is actually due to patch file 0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch
setting PIDFile=/var/run/watchdog.pid. Modify PIDFile in the patch
to be correctly set to /run/watchdog.pid.

(From OE-Core rev: c279c9d7f0c948856052015cad59310a55274b92)

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-10-08 11:22:24 +01:00
Chen Qi
d200e3196d watchdog: fix init script for sysvinit
The current init script is installed from source with redhat style.
It does not get configuration from /etc/default/watchdog. We should use
debian style init script.

Write our own script just like what wd_keepalive does.
Also, in the init script, we check the existence of /dev/watchdog to
determine whether to start the daemon or not.

(From OE-Core rev: a31f8dd34e8ea34dfb087ed464575aa390ece09b)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-06-18 11:07:57 +01:00
Chen Qi
8aee3cce93 watchdog: make init script start after syslog
We need to make sure logs are not lost. As long as there's no
strong and vaild reason, we should make daemons start after syslog.

As a side effect, we could check the logs to see if there are
some potential problem. In OE, the 'parselogs' test case could
do it automatically.

(From OE-Core rev: 41e4d728ef92586e2714fa0c136b838c3fda051e)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-06-18 11:07:57 +01:00
Chen Qi
459d92e98d watchdog: disable systemd services by default
systemd has internal support for watchdog. See the RuntimeWatchdogSec
in /etc/systemd/system.conf.

We'd better just disable this service by default. If users want to use
watchdog, consider using the systemd one.

(From OE-Core rev: 183c9125e78ae1035894600a66b4ea1fa6a3a532)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-06-18 11:07:57 +01:00
Chen Qi
1e703e1b05 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>
2018-06-18 11:07:57 +01:00
Khem Raj
fd912fec3e watchdog: Use libtirpc even on glibc
We dropped in-tree obsoleted rpc from glibc

(From OE-Core rev: 6f4814dd3a14faa49b9b501ec2e19f0ff89fd860)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-05-09 10:47:51 +01:00
Maxin B. John
c3c336f106 watchdog: remove interdependencies of watchdog and wd_keepalive
Since watchdog and watchdog-keepalive packages can't be installed
together, move wd_keepalive.service to watchdog-keepalive package.

Remove the inter-dependencies of watchdog and wd_keepalive
services as well.

[YOCTO #12565]

(From OE-Core rev: 1d09eacc78ff44df54d6ace26702f4d9bf9e639c)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-20 09:59:32 +00:00
Ross Burton
d8de33b0c2 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.

(From OE-Core rev: 7c8e3b9bd26b35654f3bd24bbb8d86b8c6e34a67)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-07 06:34:51 -08:00
Kai Kang
c14550deb8 watchdog: enable systemd support
Inherit systemd.bbclass to enable systemd support for watchdog.

And fix indentation of do_install_append() as well according to:
https://www.openembedded.org/wiki/Styleguide#Format_Guidelines

(From OE-Core rev: a30fcb95d527bc2a0981af5c1ed179a122bb055c)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-30 11:14:26 +01:00
Fabio Berton
e051c70250 watchdog: Add RCONFLICTS to watchdog-keepalive and split RDEPENDS
watchdog-keepalive is a simplified version of the watchdog daemon
and can't be installed along with watchdog daemon, we need to
choose which daemon install.

(From OE-Core rev: 35e36f7f2d1f7e3ef70ba473a91fb6f946752f1b)

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-02-15 20:06:42 -08:00
Fabio Berton
38602249e2 watchdog-config: Add recipe
Provides configuration files for watchdog.
Add watchdog-config as a runtime dependence of watchdog and remove
watchdog.conf file from watchdog installation.

(From OE-Core rev: 6864ad2e863205472f8ea2057c61e949dc450151)

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-09-09 11:53:36 +01:00
Fabio Berton
7a79aba22b watchdog: Add wd_keepalive package
This is a simplified version of the watchdog daemon. It only opens
/dev/watchdog, and keeps writing to it often enough to keep the kernel
from resetting, at least once per minute. Each write delays the reboot
time another minute. After a minute of inactivity the watchdog hardware
will cause a reset. In the case of the software watchdog the ability to
reboot will depend on the state of the machines and interrupts.

Installs wd_keepalive binary and enable initscript.

(From OE-Core rev: b76af8a0982c3c7473bd6ba067d1c8030d4d2f26)

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-09-09 11:53:36 +01:00
Khem Raj
fff33f1c22 watchdog: Fix build with musl
A similar patch has been submitted upstream

(From OE-Core rev: f6f531e7795dceefa8a42246cb9ed4efbffca2dd)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01 16:22:44 +01:00
Alexander Kanavin
0fb7a43585 watchdog: update to 5.15
Removed patches are all merged upstream.

(From OE-Core rev: e25b27c89dd13f5a311b49a974b4410e7993ddae)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-04 14:13:35 +01:00
Khem Raj
bb4e6e08e5 watchdog: Disable nfs on musl targets
Fixes build issue on musl where it needs to link to sunrpc
when enabling nfs

(From OE-Core rev: 958af8fdc4ebec44a21cbdb6ca76351da7c6fdc0)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-20 23:12:27 +00:00
Khem Raj
93fb408e78 watchdog: Fix build with musl
This patch is generic but is found during compiling watchdog with musl

(From OE-Core rev: 00d30f7c772299f612e5f4d975042280e0d18f83)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-24 09:40:28 +00:00
Alexander Kanavin
75c6929493 package_regex.inc: split sourceforge related entries to their own recipes
(From OE-Core rev: 4c5899fa0b8258f2754e3080dae5535e3b248e91)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:52 +00:00
Ross Burton
4b38be689f meta: add some missing Upstream-Status tags to patches
Where Signed-off-by statements have been added they were sourced from the
original commit where the author claims creation.

(From OE-Core rev: 3e6f57059d1a5343fe1432fba408ee3f33b4c2f7)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-11-25 07:50:32 +00:00
Diego Rondini
98487ccb5f watchdog: Provide and install initscript
Provide and install an initscript for the watchdog package.
In particular:
- watchdog-init.patch adapts redhat initscript to be compatibile with
  OpenEmbedded;
- watchdog-conf.patch selects /dev/watchdog as default device;
- changes to the recipe install and configure the initscript.

(From OE-Core rev: 415be16794dfe9122e6eedff950bede2070008ed)

Signed-off-by: Diego Rondini <diego.ml@zoho.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-22 14:42:17 +00:00
Saul Wold
c58237560d watchdog: Upgrade to 5.14
Move the patches from generic files to watchdog
Rebased the fix-ping due to code reorg on the source

(From OE-Core rev: fb2e1fd7d2df68d02f5da7dbf4390ea03e7eafdb)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-11-09 10:21:22 +00:00
Richard Purdie
55f1e47eaa watchdog: Fix case where ${B} != ${S}
(From OE-Core rev: 0ecfe4fd7d89252a7db6c9361fb5674cb098796d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 16:54:36 +00:00
Khem Raj
bc7bbe9df7 watchdog: Upgrade 5.12 -> 5.13
Part of ping failure patch is already applied
in 5.13 hence refreshed the patch.
Tested on x86_64 box

(From OE-Core rev: 1834400555d0e2bad73ee472d5991464fec70d53)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-15 01:53:04 +00:00
Saul Wold
8daf311c3b watchdog: fix SRC_URI _ -> -
(From OE-Core rev: 3d27ee3da296b57b6bc702431437e635c53697f7)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-13 20:10:33 +01:00
Radu Moisan
fe800caf59 watchdog: Upgrade to upstream v5.12
sourceforge.net link is broken at the time of this patch,
so I added a mirror.
License changed to GPLv2+

(From OE-Core rev: 1452b5e60eff29e7423ecdd51d2d942e88dcc263)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-02 15:28:37 +01:00
Roy.Li
b68fb414f9 watchdog: fix ping mode failure
[YOCTO #2755]

When watchdog works on ping mode, the system will be rebooted since
watchdog can not receive the expected ECOREPLY on a setting interval.

Ping mode uses a raw socket to send a ECO packet, then uses select()
to wait and recvfrom() to receive the ECOREPLY packet, if select()
shows the data is ready, and the data is not the expected ECOREPLY,
and waiting time is not overdue, it will continue use select() and
recvfrom().

Problem is that the raw socket can receive any icmp packets, if we do
not set filters, and there are many icmp packets on socket, this
program will not find its interested ECOREPLY packet in a special
interval, which makes the ping mode fail.

Other program is that watchdog sometime can not reach the call of
recvfrom to try to receive packets since tv_sec of struct timeval
of select parameter is 0.

The timeout of select() is the result of ping interval minusing the
time of calling gettimeofday spending, when ping interval is 1 second,
and the call of gettimeofday() spends several useconds, the tv_sec of
struct timeval of select parameter must be 0, at that condition, we
should think it is valid of tv_sec of struct timeval of select parameter
be 0

(From OE-Core rev: 90f3a90413aa1e08c3206b838dcaee0c1c640dc7)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:57:27 +01:00
Saul Wold
17895d3559 watchdog: Fix License warning
WARNING: watchdog: No generic license file exists for: GPL in any provider
(From OE-Core rev: c7abbaf6b73191f5580826aac5edbbc1eb0823fa)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-16 10:40:30 +00:00
Shane Wang
26096cfc05 watchdog: upgrade to 5.11
(From OE-Core rev: effed56330a54f2f20704184484193cd1125f377)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-03 12:14:36 +00:00
Mark Hatle
f992d6b434 recipes-extended: Add Summary information
Add Summary information and update descriptions as necessary.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-12-16 15:53:08 +00:00
Saul Wold
3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Richard Purdie
d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00