[oe-commits] Martin Jansa : dhcp: fix parsing warning

git at git.openembedded.org git at git.openembedded.org
Mon Aug 24 12:02:35 UTC 2015


Module: meta-openembedded.git
Branch: master-next
Commit: 118b51c12b57969c67008af6f7542835bceca968
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=118b51c12b57969c67008af6f7542835bceca968

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Wed Aug  5 19:18:00 2015 +0200

dhcp: fix parsing warning

* fixes:
  WARNING: Variable key FILES_${PN}-client (${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf)
    replaces original key FILES_dhcp-client ( ${systemd_unitdir}/system/dhclient.service).

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
index 6c0fd02..94d7bd6 100644
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
@@ -5,16 +5,16 @@ SYSTEMD_PACKAGES += "dhcp-client"
 SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
 SYSTEMD_AUTO_ENABLE_dhcp-client = "disable"
 
-FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
+FILES_${PN}-client += "${systemd_unitdir}/system/dhclient.service"
 RPROVIDES_dhcp-server += "dhcp-server-systemd"
 RREPLACES_dhcp-server += "dhcp-server-systemd"
 RCONFLICTS_dhcp-server += "dhcp-server-systemd"
 RPROVIDES_dhcp-relay += "dhcp-relay-systemd"
 RREPLACES_dhcp-relay += "dhcp-relay-systemd"
 RCONFLICTS_dhcp-relay += "dhcp-relay-systemd"
-RPROVIDES_dhcp-client += "dhcp-client-systemd"
-RREPLACES_dhcp-client += "dhcp-client-systemd"
-RCONFLICTS_dhcp-client += "dhcp-client-systemd"
+RPROVIDES_${PN}-client += "dhcp-client-systemd"
+RREPLACES_${PN}-client += "dhcp-client-systemd"
+RCONFLICTS_${PN}-client += "dhcp-client-systemd"
 
 SRC_URI += "file://dhclient.service"
 



More information about the Openembedded-commits mailing list