[oe-commits] Chen Qi : dhcp: use ${PN} for SYSTEMD_SERVICES

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: c3a152f946f7cb1666384fd7a214f883cbaecb56
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c3a152f946f7cb1666384fd7a214f883cbaecb56

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Mon Sep 15 15:46:13 2014 +0800

dhcp: use ${PN} for SYSTEMD_SERVICES

We should use ${PN} instead of hardcoding 'dhcp' for SYSTEMD_SERVICES,
otherwise we would have 'installed-not-shipped' QA error if we are building
lib32-dhcp.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-connectivity/dhcp/dhcp.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index a175254..4949e02 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -21,12 +21,12 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
 
 inherit autotools systemd
 
-SYSTEMD_PACKAGES = "dhcp-server dhcp-relay"
-SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
-SYSTEMD_AUTO_ENABLE_dhcp-server = "disable"
+SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay"
+SYSTEMD_SERVICE_${PN}-server = "dhcpd.service"
+SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
 
-SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
-SYSTEMD_AUTO_ENABLE_dhcp-relay = "disable"
+SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
+SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
 
 TARGET_CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \