[REGRESSION] Re: [PATCH v2] systemd: Add hooks to stop/start xen-watchdog on suspend/resume

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

On 17/07/2025 9:16 pm, Mykola Kvach wrote:
> diff --git a/m4/systemd.m4 b/m4/systemd.m4
> index ab12ea313d..ee684d3391 100644
> --- a/m4/systemd.m4
> +++ b/m4/systemd.m4
> @@ -28,6 +28,12 @@ AC_DEFUN([AX_SYSTEMD_OPTIONS], [
>               [set directory for systemd modules load files 
> [PREFIX/lib/modules-load.d/]]),
>               [SYSTEMD_MODULES_LOAD="$withval"], [SYSTEMD_MODULES_LOAD=""])
>       AC_SUBST(SYSTEMD_MODULES_LOAD)
> +
> +     AC_ARG_WITH(systemd-sleep,
> +             AS_HELP_STRING([--with-systemd-sleep=DIR],
> +             [set directory for systemd sleep script files 
> [PREFIX/lib/systemd/system-sleep/]]),
> +             [SYSTEMD_SLEEP_DIR="$withval"], [SYSTEMD_SLEEP_DIR=""])
> +     AC_SUBST(SYSTEMD_SLEEP_DIR)
>  ])
>  
>  AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [
> @@ -69,6 +75,14 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
>       AS_IF([test "x$SYSTEMD_MODULES_LOAD" = x], [
>           AC_MSG_ERROR([SYSTEMD_MODULES_LOAD is unset])
>       ], [])
> +
> +     AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [
> +         SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/"
> +     ], [])
> +
> +     AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [
> +         AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset])
> +     ], [])
>  ])

Marek reports that this breaks the build.

https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099

Specifically, for a build using --enable-systemd (to get the
initscripts) but without systemd-dev(el) installed.

A while back we went to a lot of effort to stop depending on
systemd-dev(el).  For the sake of one path, we don't want to bring that
dependency back.

Can we see about breaking this dependency again please?

~Andrew