[v4,10/13] package/sysrepo: update to new systemd

Message ID	20191212075400.1499536-11-jeremy.rosen@smile.fr
State	Superseded
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr> To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:57 +0100 Message-Id: <20191212075400.1499536-11-jeremy.rosen@smile.fr> In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 10/13] package/sysrepo: update to new systemd Precedence: list Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	use host-systemd to enable units \| expand [v4,00/13] use host-systemd to enable units [v4,01/13] new recipe : host-systemd [v4,02/13] use host-systemctl preset all to enable units [v4,03/13] fix tty handling [v4,04/13] fix trivial packages with buildroot-provided services [v4,05/13] fix trivial cases, upstream-provided services [v4,06/13] package/connman: adapt to preset-all [v4,07/13] package/linuxptp adapt to preset-all [v4,08/13] package/network-manager: adapt to preset-all [v4,09/13] package/wpa_supplicant: adapt for preset-all [v4,10/13] package/sysrepo: update to new systemd [v4,11/13] package/syslog-ng: implement default using DefaultInstance [v4,12/13] package/rauc: add a WantedBy section to the unit [v4,13/13] package/alsa-utils: add a WantedBy section to the unit

Message ID

20191212075400.1499536-11-jeremy.rosen@smile.fr

State

Superseded

Headers

From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr>
To: buildroot@buildroot.org
Date: Thu, 12 Dec 2019 08:53:57 +0100
Message-Id: <20191212075400.1499536-11-jeremy.rosen@smile.fr>
In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr>
References: <20191212075400.1499536-1-jeremy.rosen@smile.fr>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH v4 10/13] package/sysrepo: update to new systemd
Precedence: list
Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= <jeremy.rosen@smile.fr>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

use host-systemd to enable units | expand

Commit Message

Jérémy ROSEN Dec. 12, 2019, 7:53 a.m. UTC

sysrepo provides it's own services so just remove the section

Also fix sysrepo not installing the files in the correct directory

Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
---
 package/sysrepo/sysrepo.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk
index 216e517526..f693ff70da 100644
--- a/package/sysrepo/sysrepo.mk
+++ b/package/sysrepo/sysrepo.mk
@@ -24,7 +24,7 @@  SYSREPO_CONF_OPTS = \
 	-DCALL_SYSREPOCFG_BIN=$(HOST_DIR)/bin/sysrepocfg \
 	-DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \
 	$(if $(BR2_INIT_SYSTEMD),-DWITH_SYSTEMD=ON) \
-	$(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=usr/lib/systemd/system)
+	$(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=/usr/lib/systemd/system)
 
 # On ARM, this is needed to prevent unaligned memory access with an optimized
 # build .. https://github.com/sysrepo/sysrepo/issues/947
@@ -41,14 +41,6 @@  define SYSREPO_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S51sysrepo-plugind
 endef
 
-define SYSREPO_INSTALL_INIT_SYSTEMD
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/sysrepod.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../../../../usr/lib/systemd/system/sysrepo-plugind.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-endef
-
 HOST_SYSREPO_CONF_OPTS = \
 	-DGEN_PYTHON2_TESTS=OFF \
 	-DENABLE_TESTS=OFF \

[v4,10/13] package/sysrepo: update to new systemd

Commit Message

Patch