diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-15 15:46:13 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 12:12:44 +0100 |
| commit | c15ed36cd659f16bceb19f3d9f0df1b2e8660298 (patch) | |
| tree | 3ce55081edc1d5c6fd4ede52d27147e7f7a7b39f | |
| parent | 3028c8efedc167ddc92c9a6b05914a1a00960764 (diff) | |
| download | poky-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>
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 10 |
1 files 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 \ | |||
| 21 | 21 | ||
| 22 | inherit autotools systemd | 22 | inherit autotools systemd |
| 23 | 23 | ||
| 24 | SYSTEMD_PACKAGES = "dhcp-server dhcp-relay" | 24 | SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay" |
| 25 | SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" | 25 | SYSTEMD_SERVICE_${PN}-server = "dhcpd.service" |
| 26 | SYSTEMD_AUTO_ENABLE_dhcp-server = "disable" | 26 | SYSTEMD_AUTO_ENABLE_${PN}-server = "disable" |
| 27 | 27 | ||
| 28 | SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" | 28 | SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service" |
| 29 | SYSTEMD_AUTO_ENABLE_dhcp-relay = "disable" | 29 | SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable" |
| 30 | 30 | ||
| 31 | TARGET_CFLAGS += "-D_GNU_SOURCE" | 31 | TARGET_CFLAGS += "-D_GNU_SOURCE" |
| 32 | EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ | 32 | EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ |