aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-09-15 15:46:13 +0800
committerChen Qi <Qi.Chen@windriver.com>2014-09-16 15:54:17 +0800
commit6a598c186a0d023d66175a7b7f29c5e09f3a97a3 (patch)
treee572b97f05c12b9728a0c2ca0895a224686ea85e
parent7862e4dcd89e37d4ef0c46443e9a812c81cb57d2 (diff)
downloadopenembedded-core-contrib-6a598c186a0d023d66175a7b7f29c5e09f3a97a3.tar.gz
openembedded-core-contrib-6a598c186a0d023d66175a7b7f29c5e09f3a97a3.tar.bz2
openembedded-core-contrib-6a598c186a0d023d66175a7b7f29c5e09f3a97a3.zip
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@windriver.com>
-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 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 \