aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd/oe-core/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-12 13:43:14 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-12 18:50:16 +0200
commit739fc9759909215ba7c4831e839e3479631de04f (patch)
tree15f900dbc27cdb92c2703ab9f88affe7bd63a282 /meta-systemd/oe-core/recipes-connectivity/dhcp
parent1482cfe735de97eec6bc87cb653c92aef002bc10 (diff)
downloadmeta-openembedded-contrib-739fc9759909215ba7c4831e839e3479631de04f.tar.gz
meta-systemd: Add not only RPROVIDES, but also RREPLACES/RCONFLICTS
with this combo opkg should automatically remove PN-systemd and replace it with PN
Diffstat (limited to 'meta-systemd/oe-core/recipes-connectivity/dhcp')
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend
index d3a322ae7f..5fbe857065 100644
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend
@@ -14,8 +14,14 @@ FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service"
FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service"
FILES_dhcp-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"
SRC_URI += "file://dhcpd.service \
file://dhclient.service \