From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Joachim Wiberg <troglobit@gmail.com>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v2 1/2] package/watchdogd: bump to version 4.0
Date: Mon, 5 Feb 2024 23:20:46 +0100 [thread overview]
Message-ID: <ZcFfPoK1A5m53B5B@landeda> (raw)
In-Reply-To: <20240130215628.884512-2-troglobit@gmail.com>
Joachim, All,
On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly:
> 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.
>
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> ---
[--SNIP--]
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 82387338d9..b6e72d0f24 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -202,6 +202,64 @@ 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.
[--SNIP--]
> +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL still referenced in package/watchdogd/Config.in
This comment is wrong: it's the _WRAP options that are referenced. So I
changed it. I also duplicated right above each such option so it's
easier to spot rather than a lone comment way below (I know you did like
the existing ext legacy, but that does not prevent improving! ;-) ).
Applied to master, thanks.
Regards,
Yann E. MORIN.
> comment "Legacy options removed in 2023.11"
>
> config BR2_PACKAGE_PYTHON_PYXB
> diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in
> index ca5933848d..0b0480ea27 100644
> --- a/package/watchdogd/Config.in
> +++ b/package/watchdogd/Config.in
> @@ -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
> diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash
> index 4ff1a3485b..0c228666bd 100644
> --- a/package/watchdogd/watchdogd.hash
> +++ b/package/watchdogd/watchdogd.hash
> @@ -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
> diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk
> index ea033b4e71..2e67c2847e 100644
> --- a/package/watchdogd/watchdogd.mk
> +++ b/package/watchdogd/watchdogd.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -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
> @@ -20,28 +20,29 @@ 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
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2024-02-05 22:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-15 7:41 [Buildroot] [PATCH 0/3] package/watchdogd: version bump and major Config.in rewrite Joachim Wiberg
2024-01-15 7:41 ` [Buildroot] [PATCH 1/3] package/watchdogd: bump to version 4.0 Joachim Wiberg
2024-01-15 7:41 ` [Buildroot] [PATCH 2/3] package/watchdogd: convert Config.in options, int -> bool Joachim Wiberg
2024-01-27 17:18 ` Yann E. MORIN
2024-01-28 8:54 ` troglobit
2024-01-30 21:56 ` [Buildroot] [PATCH v2 0/2] package/watchdogd: slightly messy bump to v4.0 Joachim Wiberg
2024-01-30 21:56 ` [Buildroot] [PATCH v2 1/2] package/watchdogd: bump to version 4.0 Joachim Wiberg
2024-02-05 22:20 ` Yann E. MORIN [this message]
2024-02-05 22:22 ` Yann E. MORIN
2024-01-30 21:56 ` [Buildroot] [PATCH v2 2/2] package/watchdogd: add menuconfig support for new system monitors Joachim Wiberg
2024-02-05 22:23 ` Yann E. MORIN
2024-01-15 7:41 ` [Buildroot] [PATCH 3/3] " Joachim Wiberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZcFfPoK1A5m53B5B@landeda \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=troglobit@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox