diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-12 13:43:14 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-12 18:50:16 +0200 |
| commit | 739fc9759909215ba7c4831e839e3479631de04f (patch) | |
| tree | 15f900dbc27cdb92c2703ab9f88affe7bd63a282 /meta-systemd/oe-core/recipes-extended | |
| parent | 1482cfe735de97eec6bc87cb653c92aef002bc10 (diff) | |
| download | meta-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-extended')
| -rw-r--r-- | meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend | 2 | ||||
| -rw-r--r-- | meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend b/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend index dc06af9a51..dd1eacff74 100644 --- a/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend +++ b/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend @@ -6,6 +6,8 @@ PRINC := "${@int(PRINC) + 4}" inherit systemd RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "crond.service" SRC_URI += "file://crond.service" diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend index b6ec2aa01a..6dded402e0 100644 --- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend +++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend @@ -7,6 +7,8 @@ inherit systemd SRC_URI += "file://lighttpd.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "lighttpd.service" do_install_append() { |