From e63aa5b05686dc36c6729500f1c0aeef6c49de7e Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 20 Oct 2016 23:32:05 -0700 Subject: dhcp_%.bbappend: fix replaces original key warning Use ${PN} rather than dhcp to keep align with oe-core to fix: WARNING: oe-core/meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb: Variable key SYSTEMD_AUTO_ENABLE_${PN}-client (enable) replaces original key SYSTEMD_AUTO_ENABLE_dhcp-client (disable). WARNING: oe-core/meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb: Variable key SYSTEMD_SERVICE_${PN}-client (dhclient.service) replaces original key SYSTEMD_SERVICE_dhcp-client (dhclient.service). Signed-off-by: Robert Yang Signed-off-by: Martin Jansa --- meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-systemd') diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend index 94d7bd65e..9c7d93f16 100644 --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend @@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SYSTEMD_PACKAGES += "dhcp-client" -SYSTEMD_SERVICE_dhcp-client = "dhclient.service" -SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" +SYSTEMD_SERVICE_${PN}-client = "dhclient.service" +SYSTEMD_AUTO_ENABLE_${PN}-client = "disable" FILES_${PN}-client += "${systemd_unitdir}/system/dhclient.service" RPROVIDES_dhcp-server += "dhcp-server-systemd" -- cgit v1.2.3-54-g00ecf