[PATCH] tools: generate systemd service files only when systemd is available

[PATCH] tools: generate systemd service files only when systemd is available

[Wei Liu]

Though that's not in any way harmful but it is on the other hand not
very useful.

Please rerun autogen.sh after applying this patch.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/configure.ac | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tools/configure.ac b/tools/configure.ac
index 113285d..850ba23 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -12,16 +12,6 @@ hotplug/Linux/init.d/sysconfig.xencommons
 hotplug/Linux/init.d/xen-watchdog
 hotplug/Linux/init.d/xencommons
 hotplug/Linux/init.d/xendomains
-hotplug/Linux/systemd/proc-xen.mount
-hotplug/Linux/systemd/var-lib-xenstored.mount
-hotplug/Linux/systemd/xen-init-dom0.service
-hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
-hotplug/Linux/systemd/xen-watchdog.service
-hotplug/Linux/systemd/xenconsoled.service
-hotplug/Linux/systemd/xendomains.service
-hotplug/Linux/systemd/xenstored.service
-hotplug/Linux/systemd/xenstored.socket
-hotplug/Linux/systemd/xenstored_ro.socket
 hotplug/Linux/vif-setup
 hotplug/Linux/xen-backend.rules
 hotplug/Linux/xen-hotplug-common.sh
@@ -386,5 +376,21 @@ AC_SUBST(LIBNL3_CFLAGS)
 fi # ! $rump
 
 AX_AVAILABLE_SYSTEMD()
+
+AS_IF([test "x$systemd" = "xy"], [
+    AC_CONFIG_FILES([
+    hotplug/Linux/systemd/proc-xen.mount
+    hotplug/Linux/systemd/var-lib-xenstored.mount
+    hotplug/Linux/systemd/xen-init-dom0.service
+    hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
+    hotplug/Linux/systemd/xen-watchdog.service
+    hotplug/Linux/systemd/xenconsoled.service
+    hotplug/Linux/systemd/xendomains.service
+    hotplug/Linux/systemd/xenstored.service
+    hotplug/Linux/systemd/xenstored.socket
+    hotplug/Linux/systemd/xenstored_ro.socket
+    ])
+])
+
 AC_OUTPUT()
 
-- 
2.1.4

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Ian Campbell]

On Tue, 2015-01-20 at 11:47 +0000, Wei Liu wrote:
> Though that's not in any way harmful but it is on the other hand not
> very useful.

It's not 100% clear in the docs that you can call this macro twice, but
it definitely doesn't say you can't so I'd assume it was OK:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

> 
> Please rerun autogen.sh after applying this patch.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  tools/configure.ac | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 113285d..850ba23 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -12,16 +12,6 @@ hotplug/Linux/init.d/sysconfig.xencommons
>  hotplug/Linux/init.d/xen-watchdog
>  hotplug/Linux/init.d/xencommons
>  hotplug/Linux/init.d/xendomains
> -hotplug/Linux/systemd/proc-xen.mount
> -hotplug/Linux/systemd/var-lib-xenstored.mount
> -hotplug/Linux/systemd/xen-init-dom0.service
> -hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> -hotplug/Linux/systemd/xen-watchdog.service
> -hotplug/Linux/systemd/xenconsoled.service
> -hotplug/Linux/systemd/xendomains.service
> -hotplug/Linux/systemd/xenstored.service
> -hotplug/Linux/systemd/xenstored.socket
> -hotplug/Linux/systemd/xenstored_ro.socket
>  hotplug/Linux/vif-setup
>  hotplug/Linux/xen-backend.rules
>  hotplug/Linux/xen-hotplug-common.sh
> @@ -386,5 +376,21 @@ AC_SUBST(LIBNL3_CFLAGS)
>  fi # ! $rump
>  
>  AX_AVAILABLE_SYSTEMD()
> +
> +AS_IF([test "x$systemd" = "xy"], [
> +    AC_CONFIG_FILES([
> +    hotplug/Linux/systemd/proc-xen.mount
> +    hotplug/Linux/systemd/var-lib-xenstored.mount
> +    hotplug/Linux/systemd/xen-init-dom0.service
> +    hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> +    hotplug/Linux/systemd/xen-watchdog.service
> +    hotplug/Linux/systemd/xenconsoled.service
> +    hotplug/Linux/systemd/xendomains.service
> +    hotplug/Linux/systemd/xenstored.service
> +    hotplug/Linux/systemd/xenstored.socket
> +    hotplug/Linux/systemd/xenstored_ro.socket
> +    ])
> +])
> +
>  AC_OUTPUT()
>  

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Wei Liu]

On Tue, Jan 20, 2015 at 11:58:43AM +0000, Ian Campbell wrote:
> On Tue, 2015-01-20 at 11:47 +0000, Wei Liu wrote:
> > Though that's not in any way harmful but it is on the other hand not
> > very useful.
> 
> It's not 100% clear in the docs that you can call this macro twice, but
> it definitely doesn't say you can't so I'd assume it was OK:
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 

I tested this patch and it worked. There is similar usage in glibc
configure.ac.

Wei.

> > 
> > Please rerun autogen.sh after applying this patch.
> > 
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > ---
> >  tools/configure.ac | 26 ++++++++++++++++----------
> >  1 file changed, 16 insertions(+), 10 deletions(-)
> > 
> > diff --git a/tools/configure.ac b/tools/configure.ac
> > index 113285d..850ba23 100644
> > --- a/tools/configure.ac
> > +++ b/tools/configure.ac
> > @@ -12,16 +12,6 @@ hotplug/Linux/init.d/sysconfig.xencommons
> >  hotplug/Linux/init.d/xen-watchdog
> >  hotplug/Linux/init.d/xencommons
> >  hotplug/Linux/init.d/xendomains
> > -hotplug/Linux/systemd/proc-xen.mount
> > -hotplug/Linux/systemd/var-lib-xenstored.mount
> > -hotplug/Linux/systemd/xen-init-dom0.service
> > -hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> > -hotplug/Linux/systemd/xen-watchdog.service
> > -hotplug/Linux/systemd/xenconsoled.service
> > -hotplug/Linux/systemd/xendomains.service
> > -hotplug/Linux/systemd/xenstored.service
> > -hotplug/Linux/systemd/xenstored.socket
> > -hotplug/Linux/systemd/xenstored_ro.socket
> >  hotplug/Linux/vif-setup
> >  hotplug/Linux/xen-backend.rules
> >  hotplug/Linux/xen-hotplug-common.sh
> > @@ -386,5 +376,21 @@ AC_SUBST(LIBNL3_CFLAGS)
> >  fi # ! $rump
> >  
> >  AX_AVAILABLE_SYSTEMD()
> > +
> > +AS_IF([test "x$systemd" = "xy"], [
> > +    AC_CONFIG_FILES([
> > +    hotplug/Linux/systemd/proc-xen.mount
> > +    hotplug/Linux/systemd/var-lib-xenstored.mount
> > +    hotplug/Linux/systemd/xen-init-dom0.service
> > +    hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> > +    hotplug/Linux/systemd/xen-watchdog.service
> > +    hotplug/Linux/systemd/xenconsoled.service
> > +    hotplug/Linux/systemd/xendomains.service
> > +    hotplug/Linux/systemd/xenstored.service
> > +    hotplug/Linux/systemd/xenstored.socket
> > +    hotplug/Linux/systemd/xenstored_ro.socket
> > +    ])
> > +])
> > +
> >  AC_OUTPUT()
> >  
> 

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Wei Liu]

On Tue, Jan 20, 2015 at 12:07:48PM +0000, Wei Liu wrote:
> On Tue, Jan 20, 2015 at 11:58:43AM +0000, Ian Campbell wrote:
> > On Tue, 2015-01-20 at 11:47 +0000, Wei Liu wrote:
> > > Though that's not in any way harmful but it is on the other hand not
> > > very useful.
> > 
> > It's not 100% clear in the docs that you can call this macro twice, but
> > it definitely doesn't say you can't so I'd assume it was OK:
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> > 
> 
> I tested this patch and it worked. There is similar usage in glibc
> configure.ac.
> 

And FYI

https://www.gnu.org/software/automake/manual/html_node/Requirements.html

contains snippets that call AC_CONFIG_FILES more than once.

So it is officially legal to do that! :-)

Wei.

> Wei.
> 
> > > 
> > > Please rerun autogen.sh after applying this patch.
> > > 
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > Cc: Ian Campbell <ian.campbell@citrix.com>
> > > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > > ---
> > >  tools/configure.ac | 26 ++++++++++++++++----------
> > >  1 file changed, 16 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/tools/configure.ac b/tools/configure.ac
> > > index 113285d..850ba23 100644
> > > --- a/tools/configure.ac
> > > +++ b/tools/configure.ac
> > > @@ -12,16 +12,6 @@ hotplug/Linux/init.d/sysconfig.xencommons
> > >  hotplug/Linux/init.d/xen-watchdog
> > >  hotplug/Linux/init.d/xencommons
> > >  hotplug/Linux/init.d/xendomains
> > > -hotplug/Linux/systemd/proc-xen.mount
> > > -hotplug/Linux/systemd/var-lib-xenstored.mount
> > > -hotplug/Linux/systemd/xen-init-dom0.service
> > > -hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> > > -hotplug/Linux/systemd/xen-watchdog.service
> > > -hotplug/Linux/systemd/xenconsoled.service
> > > -hotplug/Linux/systemd/xendomains.service
> > > -hotplug/Linux/systemd/xenstored.service
> > > -hotplug/Linux/systemd/xenstored.socket
> > > -hotplug/Linux/systemd/xenstored_ro.socket
> > >  hotplug/Linux/vif-setup
> > >  hotplug/Linux/xen-backend.rules
> > >  hotplug/Linux/xen-hotplug-common.sh
> > > @@ -386,5 +376,21 @@ AC_SUBST(LIBNL3_CFLAGS)
> > >  fi # ! $rump
> > >  
> > >  AX_AVAILABLE_SYSTEMD()
> > > +
> > > +AS_IF([test "x$systemd" = "xy"], [
> > > +    AC_CONFIG_FILES([
> > > +    hotplug/Linux/systemd/proc-xen.mount
> > > +    hotplug/Linux/systemd/var-lib-xenstored.mount
> > > +    hotplug/Linux/systemd/xen-init-dom0.service
> > > +    hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
> > > +    hotplug/Linux/systemd/xen-watchdog.service
> > > +    hotplug/Linux/systemd/xenconsoled.service
> > > +    hotplug/Linux/systemd/xendomains.service
> > > +    hotplug/Linux/systemd/xenstored.service
> > > +    hotplug/Linux/systemd/xenstored.socket
> > > +    hotplug/Linux/systemd/xenstored_ro.socket
> > > +    ])
> > > +])
> > > +
> > >  AC_OUTPUT()
> > >  
> > 

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Ian Jackson]

Wei Liu writes ("[PATCH] tools: generate systemd service files only when systemd is available"):
> Though that's not in any way harmful but it is on the other hand not
> very useful.

What is the effect of this in the context of a distro package, where
the build may occur in a different situation to the installed
package ?

Ian.

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Wei Liu]

On Tue, Jan 20, 2015 at 02:49:12PM +0000, Ian Jackson wrote:
> Wei Liu writes ("[PATCH] tools: generate systemd service files only when systemd is available"):
> > Though that's not in any way harmful but it is on the other hand not
> > very useful.
> 
> What is the effect of this in the context of a distro package, where
> the build may occur in a different situation to the installed
> package ?
> 

Not sure if I understand you question but let me try to answer.

Conceptually speaking for Xen's systemd components to function properly
the service files may need to rely on other components to be built. If
systemd is not available at build time that means those components which
service files rely on cannot be built, so the service files alone aren't
very useful even if you generate and package them.

Practically speaking those service files don't depend on any systemd
specific components to be built at the moment so it's harmless to
package them.

Wei.

> Ian.

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Ian Campbell]

On Tue, 2015-01-20 at 15:12 +0000, Wei Liu wrote:
> On Tue, Jan 20, 2015 at 02:49:12PM +0000, Ian Jackson wrote:
> > Wei Liu writes ("[PATCH] tools: generate systemd service files only when systemd is available"):
> > > Though that's not in any way harmful but it is on the other hand not
> > > very useful.
> > 
> > What is the effect of this in the context of a distro package, where
> > the build may occur in a different situation to the installed
> > package ?
> > 
> 
> Not sure if I understand you question but let me try to answer.
> 
> Conceptually speaking for Xen's systemd components to function properly
> the service files may need to rely on other components to be built.

Where components is things like socket activation support in xenstored
etc, I think? Or is there more to it?

>  If
> systemd is not available at build time that means those components which
> service files rely on cannot be built, so the service files alone aren't
> very useful even if you generate and package them.
> 
> Practically speaking those service files don't depend on any systemd
> specific components to be built at the moment so it's harmless to
> package them.
> 
> Wei.
> 
> > Ian.

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Wei Liu]

On Tue, Jan 20, 2015 at 03:19:31PM +0000, Ian Campbell wrote:
> On Tue, 2015-01-20 at 15:12 +0000, Wei Liu wrote:
> > On Tue, Jan 20, 2015 at 02:49:12PM +0000, Ian Jackson wrote:
> > > Wei Liu writes ("[PATCH] tools: generate systemd service files only when systemd is available"):
> > > > Though that's not in any way harmful but it is on the other hand not
> > > > very useful.
> > > 
> > > What is the effect of this in the context of a distro package, where
> > > the build may occur in a different situation to the installed
> > > package ?
> > > 
> > 
> > Not sure if I understand you question but let me try to answer.
> > 
> > Conceptually speaking for Xen's systemd components to function properly
> > the service files may need to rely on other components to be built.
> 
> Where components is things like socket activation support in xenstored
> etc, I think? Or is there more to it?
> 

Yes. [c/o]xenstored needs to link against systemd to use socket
activation. That's the only thing at the moment.

I was just speaking about things in general -- in case we have some more
daemons that need to link against systemd.

Wei.

> >  If
> > systemd is not available at build time that means those components which
> > service files rely on cannot be built, so the service files alone aren't
> > very useful even if you generate and package them.
> > 
> > Practically speaking those service files don't depend on any systemd
> > specific components to be built at the moment so it's harmless to
> > package them.
> > 
> > Wei.
> > 
> > > Ian.
> 

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Ian Jackson]

Wei Liu writes ("Re: [PATCH] tools: generate systemd service files only when systemd is available"):
> On Tue, Jan 20, 2015 at 03:19:31PM +0000, Ian Campbell wrote:
> > Where components is things like socket activation support in xenstored
> > etc, I think? Or is there more to it?
> 
> Yes. [c/o]xenstored needs to link against systemd to use socket
> activation. That's the only thing at the moment.
> 
> I was just speaking about things in general -- in case we have some more
> daemons that need to link against systemd.

OK, right.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks,
Ian.

Re: [PATCH] tools: generate systemd service files only when systemd is available

[Ian Campbell]

On Tue, 2015-01-20 at 15:41 +0000, Ian Jackson wrote:
> Wei Liu writes ("Re: [PATCH] tools: generate systemd service files only when systemd is available"):
> > On Tue, Jan 20, 2015 at 03:19:31PM +0000, Ian Campbell wrote:
> > > Where components is things like socket activation support in xenstored
> > > etc, I think? Or is there more to it?
> > 
> > Yes. [c/o]xenstored needs to link against systemd to use socket
> > activation. That's the only thing at the moment.
> > 
> > I was just speaking about things in general -- in case we have some more
> > daemons that need to link against systemd.
> 
> OK, right.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Applied, thanks.