diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
commit | 908778078736bd36f7a60a2d576d415cb8e000fa (patch) | |
tree | c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-apps/watchdog/files | |
parent | 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff) |
gentoo resync : 22.05.2021
Diffstat (limited to 'sys-apps/watchdog/files')
-rw-r--r-- | sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch | 27 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog-5.15-musl.patch | 23 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog-init.d | 47 |
3 files changed, 0 insertions, 97 deletions
diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch deleted file mode 100644 index bee4ddc8d7bc..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit f52c40680f0aad44b9ae16648803453ec00cbb2c -Author: Paul Crawford <psc@sat.dundee.ac.uk> -Date: Fri Dec 30 15:55:45 2016 +0000 - - Compile with musl when nfs is disabled - - musl does by default not ship with rpc headers. The watchdog should - not require rpc headers when nfs support is disabled. - - Patch by Felix Janda <fjanda@users.sf.net> - -diff --git a/include/sundries.h b/include/sundries.h -index 4379982..98c489a 100644 ---- a/include/sundries.h -+++ b/include/sundries.h -@@ -9,9 +9,11 @@ - #include <signal.h> - #include <stdarg.h> - #include <stdlib.h> -+#if HAVE_NFS - #if !defined(bool_t) && !defined(__GLIBC__) - #include <rpc/types.h> - #endif -+#endif - - extern int mount_mount_quiet; - extern int mount_verbose; diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl.patch b/sys-apps/watchdog/files/watchdog-5.15-musl.patch deleted file mode 100644 index ae62c8014e5b..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.15-musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit c5cb4e1a0339844ae3f55ff1dc4a716c28012f05 -Author: Paul Crawford <psc@sat.dundee.ac.uk> -Date: Tue Jun 28 18:08:48 2016 +0100 - - 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. Patch supplied by Khem Raj <raj.khem@gmail.com> - -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> diff --git a/sys-apps/watchdog/files/watchdog-init.d b/sys-apps/watchdog/files/watchdog-init.d deleted file mode 100644 index 734a02cdbcbe..000000000000 --- a/sys-apps/watchdog/files/watchdog-init.d +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use logger -} - -get_config() { - set -- ${WATCHDOG_OPTS} - while [ -n "$1" ] ; do - if [ "$1" = "-c" -o "$1" = "--config-file" ] ; then - echo $2 - return - fi - shift - done - echo /etc/watchdog.conf -} - -get_delay() { - # man this is fugly - sed -n \ - -e '1{x;s:.*:10:;x}' \ - -e 's:#.*::' \ - -e 's:^[[:space:]]*::' \ - -e '/^interval/{s:.*=::;h}' \ - -e '${g;p}' \ - $(get_config) -} - -start() { - ebegin "Starting watchdog" - start-stop-daemon --start \ - --exec /usr/sbin/watchdog --pidfile /var/run/watchdog.pid \ - -- ${WATCHDOG_OPTS} - eend $? -} - -stop() { - ebegin "Stopping watchdog" - start-stop-daemon --stop \ - --exec /usr/sbin/watchdog --pidfile /var/run/watchdog.pid \ - --retry $(get_delay) - eend $? -} |