NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/watchdogd: bump to version 4.0

Browse Source 
For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0

 - Major feature upgrade, command line and .conf files compatible
 - LICENSE hash update due to update in copyright years
 - Enabling system monitor plugins have changed syntax upstream.  The
   `--with-foo=SECONDS` is now just `--with-foo`

This last upstream change require converting affected Config.in options
from int -> bool.  Legacy _WRAP:ers have been added to Config.legacy.in,
modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS.

Forcibly disable new monitors; they'll be enabled in a followup commit.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
[yann.morin.1998@free.fr:
  - forcibly disable new monitors
  - minor tweaks in Config.in.legacy
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Joachim Wiberg 2024-01-30 22:56:24 +01:00 committed by Yann E. MORIN
parent 61295f5ced
commit 7371cb294d
4 changed files with 95 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Config.in.legacy
View File

@ -202,6 +202,66 @@ config BR2_KERNEL_HEADERS_6_5
Version 6.5.x of the Linux kernel headers are no longer
maintained upstream and are now removed.
config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL
int "watchdogd generic poll has been replaced"
default 0
help
The generic script poll interval has been replaced upstream
with a boolean on/off. Your configuration has been migrated.
Set this legacy option to 0 here to remove the warning.
# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP
bool
default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL != 0
select BR2_LEGACY
config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL
int "watchdogd loadavg poll has been replaced"
default 0
help
The CPU load average poll interval has been replaced upstream
with a boolean on/off. Your configuration has been migrated.
Set this legacy option to 0 here to remove the warning.
# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP
bool
default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL != 0
select BR2_LEGACY
config BR2_PACKAGE_WATCHDOGD_FILENR_POLL
int "watchdogd filenr poll has been replaced"
default 0
help
The file descriptor leak poll has been replaced upstream with
a boolean on/off. Your configuration has been migrated.
Set this legacy option to 0 here to remove the warning.
# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
config BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP
bool
default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL != 0
select BR2_LEGACY
config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL
int "watchdogd meminfo poll has been replaced"
default 0
help
The memleak detector poll interval has been replaced upstream
with a boolean on/off. Your configuration has been migrated.
Set this legacy option to 0 here to remove the warning.
# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in
config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP
bool
default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL != 0
select BR2_LEGACY
comment "Legacy options removed in 2023.11"
config BR2_PACKAGE_PYTHON_PYXB

36
package/watchdogd/Config.in
View File

@ -27,32 +27,28 @@ config BR2_PACKAGE_WATCHDOGD_TEST_SUITE
They can be used to verify correct operation of watchdogd and
the kernel watchdog driver.
config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL
int "Generic script monitor poll interval (sec)"
default "300"
config BR2_PACKAGE_WATCHDOGD_GENERIC
bool "Generic script monitor"
default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP # legacy 2024.02
help
Poll interval for generic script monitor, in seconds. A value
of zero (0) disables the monitor.
Enable generic script monitor.
config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL
int "CPU load average monitor poll interval (sec)"
default "300"
config BR2_PACKAGE_WATCHDOGD_LOADAVG
bool "CPU load average monitor"
default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP # legacy 2024.02
help
Poll interval for CPU load average monitor, in seconds. A
value of zero (0) disables the monitor.
Enable CPU load average monitor.
config BR2_PACKAGE_WATCHDOGD_FILENR_POLL
int "File descriptor leak monitor poll interval (sec)"
default "300"
config BR2_PACKAGE_WATCHDOGD_FILENR
bool "File descriptor leak monitor"
default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP # legacy 2024.02
help
Poll interval for file descriptor leak monitor, in seconds. A
value of zero (0) disables the monitor.
Enable file descriptor leak monitor.
config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL
int "Memory leak monitor poll interval (sec)"
default "300"
config BR2_PACKAGE_WATCHDOGD_MEMINFO
bool "Memory leak monitor"
default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP # legacy 2024.02
help
Poll interval for memory leak monitor, in seconds. A value of
zero (0) disables the monitor.
Enable memory leak monitor.
endif

4
package/watchdogd/watchdogd.hash
View File

@ -1,5 +1,5 @@
# Upstream .sha256 from GitHub
sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz
sha256 7f38bc691353a51fc6feb2ccab60417c0284dd3f4d55c50d8b1781fda70d8101 watchdogd-4.0.tar.gz
# Locally calculated
sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE
sha256 e233c56d807c74c67f2eff47ad03c216144cdd374d8d7578b996c28c260eadda LICENSE

27
package/watchdogd/watchdogd.mk
View File

@ -4,44 +4,51 @@
#
################################################################################
WATCHDOGD_VERSION = 3.5
WATCHDOGD_VERSION = 4.0
WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION)
WATCHDOGD_LICENSE = ISC
WATCHDOGD_LICENSE_FILES = LICENSE
WATCHDOGD_CPE_ID_VENDOR = troglobit
WATCHDOGD_INSTALL_STAGING = YES
WATCHDOGD_DEPENDENCIES = host-pkgconf libconfuse libite libuev
WATCHDOGD_CONF_OPTS = --disable-compat --disable-examples --disable-test-mode
WATCHDOGD_SELINUX_MODULES = watchdog
WATCHDOGD_CONF_OPTS = \
--disable-compat \
--disable-examples \
--disable-test-mode \
--without-fsmon \
--without-tempmon
ifneq ($(BR2_PACKAGE_WATCHDOGD_TEST_SUITE),y)
WATCHDOGD_CONF_OPTS += --disable-builtin-tests
else
WATCHDOGD_CONF_OPTS += --enable-builtin-tests
endif
ifeq ($(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL),0)
ifneq ($(BR2_PACKAGE_WATCHDOGD_GENERIC),y)
WATCHDOGD_CONF_OPTS += --without-generic
else
WATCHDOGD_CONF_OPTS += --with-generic=$(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL)
WATCHDOGD_CONF_OPTS += --with-generic
endif
ifeq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL),0)
ifneq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG),y)
WATCHDOGD_CONF_OPTS += --without-loadavg
else
WATCHDOGD_CONF_OPTS += --with-loadavg=$(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL)
WATCHDOGD_CONF_OPTS += --with-loadavg
endif
ifeq ($(BR2_PACKAGE_WATCHDOGD_FILENR_POLL),0)
ifneq ($(BR2_PACKAGE_WATCHDOGD_FILENR),y)
WATCHDOGD_CONF_OPTS += --without-filenr
else
WATCHDOGD_CONF_OPTS += --with-filenr=$(BR2_PACKAGE_WATCHDOGD_FILENR_POLL)
WATCHDOGD_CONF_OPTS += --with-filenr
endif
ifeq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL),0)
ifneq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO),y)
WATCHDOGD_CONF_OPTS += --without-meminfo
else
WATCHDOGD_CONF_OPTS += --with-meminfo=$(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL)
WATCHDOGD_CONF_OPTS += --with-meminfo
endif
endif
define WATCHDOGD_INSTALL_INIT_SYSV