This doesn't exclude sysvinit scripts, but allows testing systemd too.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
--
Changes in v3:
- switch to trixie

New in v2.

Requires containers rebuild
---
 automation/build/debian/13-x86_64.dockerfile | 1 +
 automation/scripts/build                     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/automation/build/debian/13-x86_64.dockerfile b/automation/build/debian/13-x86_64.dockerfile
index 6382bafbd5bd..9387da453fea 100644
--- a/automation/build/debian/13-x86_64.dockerfile
+++ b/automation/build/debian/13-x86_64.dockerfile
@@ -26,6 +26,7 @@ RUN <<EOF
         cpio
         git-core
         pkg-config
+        systemd-dev
         wget
         # libxenguest dombuilder
         libbz2-dev
diff --git a/automation/scripts/build b/automation/scripts/build
index 7a81d229decd..e77529cfc8ec 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -71,6 +71,9 @@ else
     # Full build.  Figure out our ./configure options
     cfgargs=("--prefix=/usr")
     cfgargs+=("--enable-docs")
+    if pkg-config systemd; then
+        cfgargs+=("--enable-systemd")
+    fi
 
     # booleans for which compiler is in use
     cc_is_gcc="$($cc --version | grep -q gcc && echo "y" || :)"
-- 
git-series 0.9.1

On 04/12/2025 4:53 pm, Marek Marczykowski-Górecki wrote:
> This doesn't exclude sysvinit scripts, but allows testing systemd too.
>
> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>

Oh - I had a task to make this happen by default, which also missed
4.21.  It's bad that configure does the wrong thing by default for systemd.

> --
> Changes in v3:
> - switch to trixie
>
> New in v2.
>
> Requires containers rebuild
> ---
>  automation/build/debian/13-x86_64.dockerfile | 1 +
>  automation/scripts/build                     | 3 +++
>  2 files changed, 4 insertions(+)
>
> diff --git a/automation/build/debian/13-x86_64.dockerfile b/automation/build/debian/13-x86_64.dockerfile
> index 6382bafbd5bd..9387da453fea 100644
> --- a/automation/build/debian/13-x86_64.dockerfile
> +++ b/automation/build/debian/13-x86_64.dockerfile
> @@ -26,6 +26,7 @@ RUN <<EOF
>          cpio
>          git-core
>          pkg-config
> +        systemd-dev

Why is this needed?  Or rather, does this patch predate my breaking of
the dependency on system-dev?

~Andrew

On Thu, Dec 04, 2025 at 09:54:41PM +0000, Andrew Cooper wrote:
> On 04/12/2025 4:53 pm, Marek Marczykowski-Górecki wrote:
> > @@ -26,6 +26,7 @@ RUN <<EOF
> >          cpio
> >          git-core
> >          pkg-config
> > +        systemd-dev
> 
> Why is this needed?  Or rather, does this patch predate my breaking of
> the dependency on system-dev?

It's still needed, without it the build fails:
https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099

Likely related to e54a6cd6a1f3802274cd3a58b07df5f012342192

-- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab

On 04/12/2025 11:11 pm, Marek Marczykowski-Górecki wrote:
> On Thu, Dec 04, 2025 at 09:54:41PM +0000, Andrew Cooper wrote:
>> On 04/12/2025 4:53 pm, Marek Marczykowski-Górecki wrote:
>>> @@ -26,6 +26,7 @@ RUN <<EOF
>>>          cpio
>>>          git-core
>>>          pkg-config
>>> +        systemd-dev
>> Why is this needed?  Or rather, does this patch predate my breaking of
>> the dependency on system-dev?
> It's still needed, without it the build fails:
> https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099
>
> Likely related to e54a6cd6a1f3802274cd3a58b07df5f012342192

Urgh.  Yeah, that breaks the build if systemd isn't installed.

We also need a build container that does not have systemd anywhere in
it, to block stuff like that getting in in the first place.

~Andrew

On Thu, Dec 04, 2025 at 11:17:03PM +0000, Andrew Cooper wrote:
> On 04/12/2025 11:11 pm, Marek Marczykowski-Górecki wrote:
> > On Thu, Dec 04, 2025 at 09:54:41PM +0000, Andrew Cooper wrote:
> >> On 04/12/2025 4:53 pm, Marek Marczykowski-Górecki wrote:
> >>> @@ -26,6 +26,7 @@ RUN <<EOF
> >>>          cpio
> >>>          git-core
> >>>          pkg-config
> >>> +        systemd-dev
> >> Why is this needed?  Or rather, does this patch predate my breaking of
> >> the dependency on system-dev?
> > It's still needed, without it the build fails:
> > https://gitlab.com/xen-project/people/marmarek/xen/-/jobs/10959608099
> >
> > Likely related to e54a6cd6a1f3802274cd3a58b07df5f012342192
> 
> Urgh.  Yeah, that breaks the build if systemd isn't installed.

Technically, it breaks "just" --enable-systemd build.

> We also need a build container that does not have systemd anywhere in
> it, to block stuff like that getting in in the first place.

That is Alpine container.

-- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab