diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/watchdog')
9 files changed, 0 insertions, 426 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config.bb b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config.bb deleted file mode 100644 index 8bf40f0f0..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Software watchdog" -DESCRIPTION = "Watchdog is a daemon that checks if your system is still \ -working. If programs in user space are not longer executed it will reboot \ -the system." -HOMEPAGE = "http://watchdog.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194" - -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = " \ - file://watchdog.default \ - file://watchdog.conf \ -" - -do_install() { - install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog - install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf -} - diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf deleted file mode 100644 index c493d12d3..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf +++ /dev/null @@ -1,42 +0,0 @@ -#ping = 172.31.14.1 -#ping = 172.26.1.255 -#interface = eth0 -#file = /var/log/messages -#change = 1407 - -# Uncomment to enable test. Setting one of these values to '0' disables it. -# These values will hopefully never reboot your machine during normal use -# (if your machine is really hung, the loadavg will go much higher than 25) -#max-load-1 = 24 -#max-load-5 = 18 -#max-load-15 = 12 - -# Note that this is the number of pages! -# To get the real size, check how large the pagesize is on your machine. -#min-memory = 1 - -#repair-binary = /usr/sbin/repair -#repair-timeout = -#test-binary = -#test-timeout = - -watchdog-device = /dev/watchdog - -# Defaults compiled into the binary -#temperature-device = -#max-temperature = 120 - -# Defaults compiled into the binary -#admin = root -#interval = 1 -#logtick = 1 -#log-dir = /var/log/watchdog - -# This greatly decreases the chance that watchdog won't be scheduled before -# your machine is really loaded -realtime = yes -priority = 1 - -# Check if rsyslogd is still running by enabling the following line -#pidfile = /var/run/rsyslogd.pid - diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default deleted file mode 100644 index 647d5abca..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default +++ /dev/null @@ -1,2 +0,0 @@ -# Start watchdog at boot time? 0 or 1 -run_watchdog=1 diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch deleted file mode 100644 index 198f19861..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8f91385dbd5e7c14b36ecbd8a01ca82c709f6d77 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 24 Jun 2016 18:19:29 +0000 -Subject: [PATCH] Include linux/param.h for EXEC_PAGESIZE definition - -Musl does not include linux/param.h whereas glibc -does, so it fails to build on musl. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/watchdog.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/watchdog.c b/src/watchdog.c -index acf6450..486384a 100644 ---- a/src/watchdog.c -+++ b/src/watchdog.c -@@ -26,6 +26,9 @@ - #include <sys/param.h> /* For EXEC_PAGESIZE */ - #include <linux/oom.h> - #include <linux/watchdog.h> -+#ifdef __linux__ -+#include <linux/param.h> -+#endif - #include <string.h> - - #include <libgen.h> --- -1.8.3.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch deleted file mode 100644 index 338e0cd14..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c1fe14fa5bd168292cc4670034bc48b954e9dac7 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Tue, 13 Mar 2018 14:49:55 +0200 -Subject: [PATCH] watchdog: remove interdependencies of watchdog and - wd_keepalive services - -Since watchdog and watchdog-keepalive packages can't be installed -together, remove the inter-dependencies of watchdog and wd_keepalive -services - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - debian/watchdog.service | 9 +++------ - debian/wd_keepalive.service | 10 +++++----- - 2 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/debian/watchdog.service b/debian/watchdog.service -index 7a2fc36..f31d1fe 100644 ---- a/debian/watchdog.service -+++ b/debian/watchdog.service -@@ -1,16 +1,13 @@ - [Unit] - Description=watchdog daemon --Conflicts=wd_keepalive.service - After=multi-user.target --OnFailure=wd_keepalive.service - - [Service] - Type=forking - EnvironmentFile=/etc/default/watchdog - ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' --ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' --ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' -+ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' -+PIDFile=/var/run/watchdog.pid - - [Install] --WantedBy=default.target -- -+WantedBy=multi-user.target -diff --git a/debian/wd_keepalive.service b/debian/wd_keepalive.service -index 45b018e..7f8b1dc 100644 ---- a/debian/wd_keepalive.service -+++ b/debian/wd_keepalive.service -@@ -1,13 +1,13 @@ - [Unit] - Description=watchdog keepalive daemon --Before=watchdog.service shutdown.target --Conflicts=watchdog.service shutdown.target -+After=multi-user.target - - [Service] - Type=forking - EnvironmentFile=/etc/default/watchdog - ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' --ExecStartPre=-/bin/systemctl reset-failed watchdog.service - ExecStart=/usr/sbin/wd_keepalive $watchdog_options --ExecStartPost=/bin/sh -c 'ln -s /var/run/wd_keepalive.pid /run/sendsigs.omit.d/wd_keepalive.pid' --ExecStopPost=/bin/sh -c 'rm -f /run/sendsigs.omit.d/wd_keepalive.pid' -+PIDFile=/var/run/wd_keepalive.pid -+ -+[Install] -+WantedBy=multi-user.target --- -2.4.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch deleted file mode 100644 index ec44c803b..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch +++ /dev/null @@ -1,16 +0,0 @@ -Signed-off-by: Diego Rondini <diego.ml@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/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch deleted file mode 100644 index b2765f190..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch +++ /dev/null @@ -1,56 +0,0 @@ -Signed-off-by: Diego Rondini <diego.ml@zoho.com> -Upstream-Status: Inappropriate - ---- watchdog-5.13.orig/redhat/watchdog.init 2014-11-12 17:18:39.125943000 +0100 -+++ watchdog-5.13/redhat/watchdog.init 2014-11-12 18:27:36.189943000 +0100 -@@ -7,7 +7,7 @@ - # Henning P. Schmiedehausen <hps@tanstaafl.de> - - # Source function library. --. /etc/rc.d/init.d/functions -+. /etc/init.d/functions - - [ -x /usr/sbin/watchdog -a -e /etc/watchdog.conf ] || exit 0 - -@@ -23,22 +23,22 @@ - - start() { - -- echo -n $"Starting $prog: " -+ echo -n "Starting $prog: " - if [ -n "$(pidofproc $prog)" ]; then -- echo -n $"$prog: already running" -- echo_failure -+ echo -n "$prog: already running " -+ failure - echo - return 1 - fi - if [ "$VERBOSE" = "yes" ]; then -- daemon /usr/sbin/${prog} -v -+ /usr/sbin/${prog} -v - else -- daemon /usr/sbin/${prog} -+ /usr/sbin/${prog} - fi - RETVAL=$? - [ $RETVAL -eq 0 ] && touch $lockfile -- [ $RETVAL -eq 0 ] && echo_success -- [ $RETVAL -ne 0 ] && echo_failure -+ [ $RETVAL -eq 0 ] && success -+ [ $RETVAL -ne 0 ] && failure - echo - return $RETVAL - } -@@ -50,8 +50,10 @@ - # and reboot the box. - killproc $prog -TERM - RETVAL=$? -- echo - [ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile -+ [ $RETVAL -eq 0 ] && success -+ [ $RETVAL -ne 0 ] && failure -+ echo - return $RETVAL - } - diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init deleted file mode 100644 index 1d3e4c555..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -#/etc/init.d/wd_keepalive: start wd_keepalive daemon. - -### BEGIN INIT INFO -# Provides: wd_keepalive -# Short-Description: Start watchdog keepalive daemon -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# X-Start-Before: $all -# Default-Start: 2 3 4 5 -# Default-Stop -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -test -x /usr/sbin/wd_keepalive || exit 0 - -# For configuration of the init script use the file -# /etc/default/watchdog, do not edit this init script. - -# Set run_watchdog to 1 to start watchdog or 0 to disable it. -run_watchdog=0 - -# Specify additional watchdog options here (see manpage). -watchdog_options="" - -# Specify module to load -watchdog_module="none" - -[ -e /etc/default/watchdog ] && . /etc/default/watchdog - -NAME=wd_keepalive -DAEMON=/usr/sbin/wd_keepalive - -STOP_RETRY_SCHEDULE='TERM/10/forever/KILL/1' - -# . /lib/lsb/init-functions - -# Mock Debian stuff -log_begin_msg() { - echo -n $* -} - -log_end_msg() { - if [ "$1" = "0" ]; then - echo 'done' - else - echo 'error' - fi -} - -log_daemon_msg() { - echo $* -} - -log_progress_msg() { - echo $* -} - - -case "$1" in - start) - if [ $run_watchdog = 1 ] - then - [ ${watchdog_module:-none} != "none" ] && /sbin/modprobe $watchdog_module - echo -n "Starting watchdog keepalive daemon: " - if start-stop-daemon --start --quiet \ - --exec $DAEMON -- $watchdog_options - then - echo wd_keepalive. - else - echo - fi - fi - ;; - - stop) - if [ $run_watchdog = 1 ] - then - echo -n "Stopping watchdog keepalive daemon: " - if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ - $STOP_RETRY_SCHEDULE - then - echo wd_keepalive. - else - echo - fi - fi - ;; - - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - - restart) - $0 force-reload - ;; - - force-reload) - if [ $run_watchdog = 0 ]; then exit 0; fi - echo -n "Restarting $NAME daemon." - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ - $STOP_RETRY_SCHEDULE - echo -n "." - if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON -- $watchdog_options - then - echo "done." - else - echo - fi - ;; - - *) - echo "Usage: /etc/init.d/wd_keepalive {start|stop|status|restart|force-reload}" - exit 1 - -esac - -exit 0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb deleted file mode 100644 index 37b37ae12..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Software watchdog" -DESCRIPTION = "Watchdog is a daemon that checks if your system is still \ -working. If programs in user space are not longer executed \ -it will reboot the system." -HOMEPAGE = "http://watchdog.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194" - -LICENSE = "GPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" - -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 \ -" - -SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828" -SRC_URI[sha256sum] = "ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/" -UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/" - -inherit autotools update-rc.d systemd - -DEPENDS_append_libc-musl = " libtirpc " -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc " -LDFLAGS_append_libc-musl = " -ltirpc " -EXTRA_OECONF_append_libc-musl = " --disable-nfs " - -INITSCRIPT_PACKAGES = "${PN} ${PN}-keepalive" - -INITSCRIPT_NAME_${PN} = "watchdog.sh" -INITSCRIPT_PARAMS_${PN} = "start 15 1 2 3 4 5 . stop 85 0 6 ." - -INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" -INITSCRIPT_PARAMS_${PN}-keepalive = "start 15 1 2 3 4 5 . stop 85 0 6 ." - -SYSTEMD_PACKAGES = "${PN} ${PN}-keepalive" -SYSTEMD_SERVICE_${PN} = "watchdog.service" -SYSTEMD_SERVICE_${PN}-keepalive = "wd_keepalive.service" - -do_install_append() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} - install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} - - install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh - install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive - - # watchdog.conf is provided by the watchdog-config recipe - rm ${D}${sysconfdir}/watchdog.conf -} - -PACKAGES =+ "${PN}-keepalive" - -FILES_${PN}-keepalive = " \ - ${sysconfdir}/init.d/wd_keepalive \ - ${systemd_system_unitdir}/wd_keepalive.service \ - ${sbindir}/wd_keepalive \ -" - -RDEPENDS_${PN} += "${PN}-config" -RRECOMMENDS_${PN} += "kernel-module-softdog" - -RDEPENDS_${PN}-keepalive += "${PN}-config" -RCONFLICTS_${PN}-keepalive += "${PN}" -RRECOMMENDS_${PN}-keepalive += "kernel-module-softdog" |
