Hi, On Fri, Dec 5, 2025 at 3:57 PM Marek Marczykowski-Górecki <[email protected]> wrote: > > On Fri, Dec 05, 2025 at 03:13:32PM +0200, Mykola Kvach wrote: > > From: Mykola Kvach <[email protected]> > > > > Using PKG_CHECK_VAR() to obtain SYSTEMD_SLEEP_DIR reintroduced a build-time > > dependency on systemd-devel. This breaks --enable-systemd builds that only > > need the initscripts. > > > > Use the same defaulting scheme as other systemd paths: if SYSTEMD_SLEEP_DIR > > isn't provided, set it to "$(prefix)/lib/systemd/system-sleep/". > > > > Fixes: e54a6cd6a1f3 ("systemd: Add hooks to stop/start xen-watchdog on > > suspend/resume") > > Reported-by: Marek Marczykowski-Górecki <[email protected]> > > Signed-off-by: Mykola Kvach <[email protected]> > > --- > > Build in which the regression was detected: > > https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099 > > Requires re-running autoconf, otherwise still fails:
Thanks for the note. I had assumed the Autoconf-generated files were refreshed during release or at merge time, since this updates generated artifacts. If the expectation is that contributors regenerate and include them with the patch, I will add the updated Autoconf outputs in the next revision of this series. > > https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/12336879267 > > With autoconf: > https://gitlab.com/xen-project/people/marmarek/xen/-/pipelines/2198372475 > > It's better now, so: > Reviewed-by: Marek Marczykowski-Górecki <[email protected]> Thanks, for the review and for testing both with and without Autoconf regeneration. > > But unconditional --enable-systemd uncovered other issues (not related > to the configure change). > > > > --- > > m4/systemd.m4 | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/m4/systemd.m4 b/m4/systemd.m4 > > index c47a25ef93..ee684d3391 100644 > > --- a/m4/systemd.m4 > > +++ b/m4/systemd.m4 > > @@ -77,7 +77,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ > > ], []) > > > > AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ > > - PKG_CHECK_VAR([SYSTEMD_SLEEP_DIR], [systemd], [systemdsleepdir]) > > + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" > > ], []) > > > > AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ > > -- > > 2.43.0 > > > > -- > Best Regards, > Marek Marczykowski-Górecki > Invisible Things Lab Best regards, Mykola
