[OE-core] [PATCH 39/42] dpkg: Fix usage of systemd unitdir vars

Pau Espin Pedrol pespin.shar at gmail.com
Sun Mar 13 19:13:37 UTC 2016


* SYSTEMD_UNITDIR var is not present in the file, it can be safely removed

Signed-off-by: Pau Espin Pedrol <pespin.shar at gmail.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 3d9e7e3..1f7f5d1 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -52,13 +52,12 @@ do_install_append () {
 	fi
 
 	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
-		install -d ${D}${systemd_unitdir}/system
-		install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/
+		install -d ${D}${systemd_system_unitdir}
+		install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_system_unitdir}/
 		sed -i -e 's, at BASE_BINDIR@,${base_bindir},g' \
 			-e 's, at SYSCONFDIR@,${sysconfdir},g' \
 			-e 's, at BINDIR@,${bindir},g' \
-			-e 's, at SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
-			${D}${systemd_unitdir}/system/dpkg-configure.service
+			${D}${systemd_system_unitdir}/dpkg-configure.service
 	fi
 }
 
-- 
2.7.1




More information about the Openembedded-core mailing list