From 6a598c186a0d023d66175a7b7f29c5e09f3a97a3 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 15 Sep 2014 15:46:13 +0800 Subject: 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 --- 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 a1752548be..4949e0201e 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 \ -- cgit 1.2.3-korg