[Buildroot] [PATCH 1/1] samba4: fix install of systemd files

[Buildroot] [PATCH 1/1] samba4: fix install of systemd files

[Fabrice Fontaine]

Since version 4.8.0 and
https://github.com/samba-team/samba/commit/080d590de1ff9f8ebc55aeffaea8d41991466549,
the systemd files (nmd.service, ...) are not available in packaging/systemd

Indeed, they are built in bin/default/packaging/systemd

So use the new --systemd-install-services configure option to install
these files

Fixes:
 - http://autobuild.buildroot.org/results/a09a065c523931c1892e81a99c57521fbe095d8b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/samba4/samba4.mk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index d95b4edfa4..e2f8e7de2f 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -161,13 +161,12 @@ define SAMBA4_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S91smb
 endef
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+SAMBA4_CONF_OPTS += --systemd-install-services
+SAMBA4_DEPENDENCIES += systemd
+endif
+
 define SAMBA4_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 644 $(@D)/packaging/systemd/nmb.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/nmb.service
-	$(INSTALL) -D -m 644 $(@D)/packaging/systemd/smb.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/smb.service
-	$(INSTALL) -D -m 644 $(@D)/packaging/systemd/winbind.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/winbind.service
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
 	ln -sf ../../../../usr/lib/systemd/system/nmb.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service
-- 
2.14.1

[Buildroot] [PATCH 1/1] samba4: fix install of systemd files

[Thomas Petazzoni]

Hello,

On Sat, 24 Nov 2018 21:12:41 +0100, Fabrice Fontaine wrote:
> Since version 4.8.0 and
> https://github.com/samba-team/samba/commit/080d590de1ff9f8ebc55aeffaea8d41991466549,
> the systemd files (nmd.service, ...) are not available in packaging/systemd
> 
> Indeed, they are built in bin/default/packaging/systemd
> 
> So use the new --systemd-install-services configure option to install
> these files
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/a09a065c523931c1892e81a99c57521fbe095d8b
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/samba4/samba4.mk | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] samba4: fix install of systemd files

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Since version 4.8.0 and
 > https://github.com/samba-team/samba/commit/080d590de1ff9f8ebc55aeffaea8d41991466549,
 > the systemd files (nmd.service, ...) are not available in packaging/systemd

 > Indeed, they are built in bin/default/packaging/systemd

 > So use the new --systemd-install-services configure option to install
 > these files

 > Fixes:
 >  - http://autobuild.buildroot.org/results/a09a065c523931c1892e81a99c57521fbe095d8b

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2018.02.x and 2018.08.x, thanks.

-- 
Bye, Peter Korsgaard