[OE-core] [PATCH 07/42] dhcp: Fix usage of systemd unitdir vars

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


Signed-off-by: Pau Espin Pedrol <pespin.shar at gmail.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 9c4233b..c57eb03 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -62,14 +62,14 @@ do_install_append () {
 	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
 
 	# Install systemd unit files
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
-	sed -i -e 's, at SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service ${D}${systemd_unitdir}/system/dhcrelay.service
-	sed -i -e 's, at SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-	sed -i -e 's, at base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
-	sed -i -e 's, at localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
+	install -d ${D}${systemd_system_unitdir}
+	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_system_unitdir}
+	install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_system_unitdir}
+	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_system_unitdir}
+	sed -i -e 's, at SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/dhcpd*.service ${D}${systemd_system_unitdir}/dhcrelay.service
+	sed -i -e 's, at SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_system_unitdir}/dhcpd*.service
+	sed -i -e 's, at base_bindir@,${base_bindir},g' ${D}${systemd_system_unitdir}/dhcpd*.service
+	sed -i -e 's, at localstatedir@,${localstatedir},g' ${D}${systemd_system_unitdir}/dhcpd*.service
 }
 
 PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
-- 
2.7.1




More information about the Openembedded-core mailing list