[OE-core] [PATCH 38/42] opkg: Fix usage of systemd unitdir vars

[Pau Espin Pedrol]

* 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/opkg/opkg_0.3.1.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg_0.3.1.bb b/meta/recipes-devtools/opkg/opkg_0.3.1.bb
index 577f495..f1bc8ae 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.1.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.1.bb
@@ -48,13 +48,12 @@ do_install_append () {
 	install -d ${D}${OPKGLIBDIR}/opkg
 
 	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
-		install -d ${D}${systemd_unitdir}/system
-		install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/
+		install -d ${D}${systemd_system_unitdir}
+		install -m 0644 ${WORKDIR}/opkg-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/opkg-configure.service
+			${D}${systemd_system_unitdir}/opkg-configure.service
 	fi
 }
 
@@ -68,7 +67,7 @@ RPROVIDES_${PN} = "opkg-collateral"
 PACKAGES =+ "libopkg"
 
 FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
-FILES_${PN} += "${systemd_unitdir}/system/"
+FILES_${PN} += "${systemd_system_unitdir}/"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
2.7.1