[ptxdist] [PATCH] samba: do not unconditionally build with systemd support

[ptxdist] [PATCH] samba: do not unconditionally build with systemd support

[Ulrich Ölmann]

Introduced by PTXdist's commit [1] the build time configuration option
"--with-systemd" has been used unconditionally. Amend that by explicitly
depending on a configuration variable.

[1] 93fce3eef4fc ("samba: version bump 3.0.37 -> 4.9.4")

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
 rules/samba.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/samba.make b/rules/samba.make
index 71832137a5b3..43fe4c597150 100644
--- a/rules/samba.make
+++ b/rules/samba.make
@@ -67,7 +67,7 @@ SAMBA_CONF_OPT	:= \
 	--disable-glusterfs \
 	--disable-cephfs \
 	--disable-spotlight \
-	--with-systemd \
+	--$(call ptx/wwo, PTXCONF_SAMBA_SYSTEMD_UNIT)-systemd \
 	--without-lttng \
 	--accel-aes=$(call ptx/ifdef,PTXCONF_ARCH_X86_64,intelaesni,none) \
 	--enable-pthreadpool \
@@ -86,7 +86,7 @@ SAMBA_CONF_OPT	:= \
 	--enable-fhs \
 	--with-piddir=/run/samba \
 	--with-lockdir=/var/lib/samba/lock \
-	--systemd-install-services \
+	$(call ptx/ifdef,PTXCONF_SAMBA_SYSTEMD_UNIT,--systemd-install-services,) \
 	--with-systemddir=/usr/lib/systemd/system
 
 $(STATEDIR)/samba.prepare:
-- 
2.25.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] samba: do not unconditionally build with systemd support

[Michael Olbrich]

Thanks, applied as d40f6618950b66972682a5c3aeaecbb274de34a6.

Michael

[sent from post-receive hook]

On Wed, 01 Apr 2020 17:06:40 +0200, Ulrich Ölmann <u.oelmann@pengutronix.de> wrote:
> Introduced by PTXdist's commit [1] the build time configuration option
> "--with-systemd" has been used unconditionally. Amend that by explicitly
> depending on a configuration variable.
> 
> [1] 93fce3eef4fc ("samba: version bump 3.0.37 -> 4.9.4")
> 
> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
> ---
>  rules/samba.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/samba.make b/rules/samba.make
> index 71832137a5b3..43fe4c597150 100644
> --- a/rules/samba.make
> +++ b/rules/samba.make
> @@ -67,7 +67,7 @@ SAMBA_CONF_OPT	:= \
>  	--disable-glusterfs \
>  	--disable-cephfs \
>  	--disable-spotlight \
> -	--with-systemd \
> +	--$(call ptx/wwo, PTXCONF_SAMBA_SYSTEMD_UNIT)-systemd \
>  	--without-lttng \
>  	--accel-aes=$(call ptx/ifdef,PTXCONF_ARCH_X86_64,intelaesni,none) \
>  	--enable-pthreadpool \
> @@ -86,7 +86,7 @@ SAMBA_CONF_OPT	:= \
>  	--enable-fhs \
>  	--with-piddir=/run/samba \
>  	--with-lockdir=/var/lib/samba/lock \
> -	--systemd-install-services \
> +	$(call ptx/ifdef,PTXCONF_SAMBA_SYSTEMD_UNIT,--systemd-install-services,) \
>  	--with-systemddir=/usr/lib/systemd/system
>  
>  $(STATEDIR)/samba.prepare:
> 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de