summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-08-05 19:18:00 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-09-15 16:06:58 +0200
commit214e1801d0efc38d3b6142bdc0d8e58ca593e34c (patch)
tree53251eadfa4d4e401719afb32c90c6a11390df4b
parentb79914ee9b72ffa8adda26d0f48a2abb42dc80cd (diff)
downloadmeta-openembedded-214e1801d0efc38d3b6142bdc0d8e58ca593e34c.tar.gz
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@gmail.com>
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend8
1 files 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 6c0fd0264..94d7bd65e 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"
5SYSTEMD_SERVICE_dhcp-client = "dhclient.service" 5SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
6SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" 6SYSTEMD_AUTO_ENABLE_dhcp-client = "disable"
7 7
8FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service" 8FILES_${PN}-client += "${systemd_unitdir}/system/dhclient.service"
9RPROVIDES_dhcp-server += "dhcp-server-systemd" 9RPROVIDES_dhcp-server += "dhcp-server-systemd"
10RREPLACES_dhcp-server += "dhcp-server-systemd" 10RREPLACES_dhcp-server += "dhcp-server-systemd"
11RCONFLICTS_dhcp-server += "dhcp-server-systemd" 11RCONFLICTS_dhcp-server += "dhcp-server-systemd"
12RPROVIDES_dhcp-relay += "dhcp-relay-systemd" 12RPROVIDES_dhcp-relay += "dhcp-relay-systemd"
13RREPLACES_dhcp-relay += "dhcp-relay-systemd" 13RREPLACES_dhcp-relay += "dhcp-relay-systemd"
14RCONFLICTS_dhcp-relay += "dhcp-relay-systemd" 14RCONFLICTS_dhcp-relay += "dhcp-relay-systemd"
15RPROVIDES_dhcp-client += "dhcp-client-systemd" 15RPROVIDES_${PN}-client += "dhcp-client-systemd"
16RREPLACES_dhcp-client += "dhcp-client-systemd" 16RREPLACES_${PN}-client += "dhcp-client-systemd"
17RCONFLICTS_dhcp-client += "dhcp-client-systemd" 17RCONFLICTS_${PN}-client += "dhcp-client-systemd"
18 18
19SRC_URI += "file://dhclient.service" 19SRC_URI += "file://dhclient.service"
20 20