From: Chen Qi Date: Mon, 15 Sep 2014 07:46:13 +0000 (+0800) Subject: dhcp: use ${PN} for SYSTEMD_SERVICES X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~32319 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3a152f946f7cb1666384fd7a214f883cbaecb56;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index a1752548be6..4949e0201ea 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 \