1. Patchew
  2. Xen
  3. View series

[PATCH] systemd: default system-sleep dir without pkg-config

Mykola Kvach posted 1 patch 5 days, 16 hours ago 
m4/systemd.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] systemd: default system-sleep dir without pkg-config
Posted by Mykola Kvach 5 days, 16 hours ago 
From: Mykola Kvach <mykola_kvach@epam.com>

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 <marmarek@invisiblethingslab.com>
Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
---
Build in which the regression was detected:
https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099
---
 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
Re: [PATCH] systemd: default system-sleep dir without pkg-config
Posted by Andrew Cooper 5 days, 14 hours ago 
On 05/12/2025 1:13 pm, Mykola Kvach wrote:
> From: Mykola Kvach <mykola_kvach@epam.com>
>
> 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 <marmarek@invisiblethingslab.com>
> Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
> ---
> Build in which the regression was detected:
> https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099
> ---
>  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], [

Actually on second thoughts...  The build failure was hitting this
second check, not the PKG_CHECK_VAR() itself.

If systemd-devel is installed, we should use what it provides.  So,
can't we just do this:

diff --git a/m4/systemd.m4 b/m4/systemd.m4
index c47a25ef9393..5fb5a7089ee3 100644
--- a/m4/systemd.m4
+++ b/m4/systemd.m4
@@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
        ], [])
 
        AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [
-           AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset])
+           SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/"
        ], [])
 ])

 
?

~Andrew
Re: [PATCH] systemd: default system-sleep dir without pkg-config
Posted by Mykola Kvach 5 days, 13 hours ago 
Hi Andrew,

On Fri, Dec 5, 2025 at 5:05 PM Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>
> On 05/12/2025 1:13 pm, Mykola Kvach wrote:
> > From: Mykola Kvach <mykola_kvach@epam.com>
> >
> > 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 <marmarek@invisiblethingslab.com>
> > Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
> > ---
> > Build in which the regression was detected:
> > https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099
> > ---
> >  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], [
>
> Actually on second thoughts...  The build failure was hitting this
> second check, not the PKG_CHECK_VAR() itself.
>
> If systemd-devel is installed, we should use what it provides.  So,
> can't we just do this:
>
> diff --git a/m4/systemd.m4 b/m4/systemd.m4
> index c47a25ef9393..5fb5a7089ee3 100644
> --- a/m4/systemd.m4
> +++ b/m4/systemd.m4
> @@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
>         ], [])
>
>         AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [
> -           AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset])
> +           SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/"
>         ], [])
>  ])
>
>
> ?

Agreed. Using the systemd-provided value when available and falling
back to the default otherwise makes sense. I’ve sent v2 of this series
with your proposed change.

>
> ~Andrew


Best regards,
Mykola
Re: [PATCH] systemd: default system-sleep dir without pkg-config
Posted by Marek Marczykowski-Górecki 5 days, 15 hours ago 
On Fri, Dec 05, 2025 at 03:13:32PM +0200, Mykola Kvach wrote:
> From: Mykola Kvach <mykola_kvach@epam.com>
> 
> 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 <marmarek@invisiblethingslab.com>
> Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
> ---
> Build in which the regression was detected:
> https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099

Requires re-running autoconf, otherwise still fails:

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 <marmarek@invisiblethingslab.com>

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
Re: [PATCH] systemd: default system-sleep dir without pkg-config
Posted by Mykola Kvach 5 days, 14 hours ago 
Hi,

On Fri, Dec 5, 2025 at 3:57 PM Marek Marczykowski-Górecki
<marmarek@invisiblethingslab.com> wrote:
>
> On Fri, Dec 05, 2025 at 03:13:32PM +0200, Mykola Kvach wrote:
> > From: Mykola Kvach <mykola_kvach@epam.com>
> >
> > 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 <marmarek@invisiblethingslab.com>
> > Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
> > ---
> > 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 <marmarek@invisiblethingslab.com>

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
Re: [PATCH] systemd: default system-sleep dir without pkg-config
Posted by Andrew Cooper 5 days, 14 hours ago 
On 05/12/2025 2:54 pm, Mykola Kvach wrote:
> Hi,
>
> On Fri, Dec 5, 2025 at 3:57 PM Marek Marczykowski-Górecki
> <marmarek@invisiblethingslab.com> wrote:
>> On Fri, Dec 05, 2025 at 03:13:32PM +0200, Mykola Kvach wrote:
>>> From: Mykola Kvach <mykola_kvach@epam.com>
>>>
>>> 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 <marmarek@invisiblethingslab.com>
>>> Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
>>> ---
>>> 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.

We regenerate on commit, but that still needs a reminder to remember to
do so.

>
>> 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 <marmarek@invisiblethingslab.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Thanks for the quick turnaround.  I'll queue this shortly.
Re: [PATCH] systemd: default system-sleep dir without pkg-config
Posted by Mykola Kvach 5 days, 13 hours ago 
Hi,
Thanks for the review.

On Fri, Dec 5, 2025 at 4:57 PM Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>
> On 05/12/2025 2:54 pm, Mykola Kvach wrote:
> > Hi,
> >
> > On Fri, Dec 5, 2025 at 3:57 PM Marek Marczykowski-Górecki
> > <marmarek@invisiblethingslab.com> wrote:
> >> On Fri, Dec 05, 2025 at 03:13:32PM +0200, Mykola Kvach wrote:
> >>> From: Mykola Kvach <mykola_kvach@epam.com>
> >>>
> >>> 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 <marmarek@invisiblethingslab.com>
> >>> Signed-off-by: Mykola Kvach <mykola_kvach@epam.com>
> >>> ---
> >>> 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.
>
> We regenerate on commit, but that still needs a reminder to remember to
> do so.

Got it, thanks for the clarification.

>
> >
> >> 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 <marmarek@invisiblethingslab.com>
>
> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> Thanks for the quick turnaround.  I'll queue this shortly.

Best regards,
Mykola

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.