summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-09-15 07:46:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 11:12:44 (GMT)
commitc15ed36cd659f16bceb19f3d9f0df1b2e8660298 (patch)
tree3ce55081edc1d5c6fd4ede52d27147e7f7a7b39f /meta/recipes-connectivity
parent3028c8efedc167ddc92c9a6b05914a1a00960764 (diff)
downloadpoky-c15ed36cd659f16bceb19f3d9f0df1b2e8660298.tar.gz
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. (From OE-Core rev: c3a152f946f7cb1666384fd7a214f883cbaecb56) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc10
1 files 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 \
21 21
22inherit autotools systemd 22inherit autotools systemd
23 23
24SYSTEMD_PACKAGES = "dhcp-server dhcp-relay" 24SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay"
25SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" 25SYSTEMD_SERVICE_${PN}-server = "dhcpd.service"
26SYSTEMD_AUTO_ENABLE_dhcp-server = "disable" 26SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
27 27
28SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" 28SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
29SYSTEMD_AUTO_ENABLE_dhcp-relay = "disable" 29SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
30 30
31TARGET_CFLAGS += "-D_GNU_SOURCE" 31TARGET_CFLAGS += "-D_GNU_SOURCE"
32EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ 32EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \