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 | |
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
37 files changed, 82 insertions, 0 deletions
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend index 64f1444fb9..63c33fb575 100644 --- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend @@ -7,6 +7,8 @@ inherit systemd SRC_URI += "file://entrance.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "entrance.service" diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend index 22e7419756..62013527c7 100644 --- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend +++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend @@ -15,4 +15,6 @@ do_install_append() { } RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "gdm.service" diff --git a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend index 0b302c6d51..a3f5f3b2c7 100644 --- a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend +++ b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend @@ -11,4 +11,6 @@ do_install_append() { } RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "mpd.service" diff --git a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend index f22f4df9f9..69ea5d3dd6 100644 --- a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend +++ b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend @@ -3,4 +3,6 @@ inherit systemd PRINC := "${@int(PRINC) + 2}" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "autofs.service" diff --git a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend index 2fc03341be..d5ea1ca0b6 100644 --- a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend +++ b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend @@ -8,6 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://domainname.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "domainname.service" do_install_append() { diff --git a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend index 9218b7ef15..8f11247a0f 100644 --- a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend +++ b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend @@ -8,6 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://ypbind.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "ypbind.service" do_install_append() { install -d ${D}${systemd_unitdir}/system diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend index ccb3d457db..7f2a796168 100644 --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend @@ -8,7 +8,11 @@ SYSTEMD_PACKAGES = "${PN} ntpdate" SYSTEMD_SERVICE_${PN} = "ntpd.service" SYSTEMD_SERVICE_ntpdate = "ntpdate.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" RPROVIDES_ntpdate += "ntpdate-systemd" +RREPLACES_ntpdate += "ntpdate-systemd" +RCONFLICTS_ntpdate += "ntpdate-systemd" FILES_ntpdate += "${systemd_unitdir}/system/ntpdate.service" diff --git a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend index 672c29d875..9d970254fa 100644 --- a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend +++ b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend @@ -5,6 +5,8 @@ SRC_URI += " file://keymaps.service" inherit systemd RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.service" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend index 22aa5631b2..b792c621bc 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend @@ -7,6 +7,8 @@ inherit systemd SRC_URI += "file://cherokee.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "cherokee.service" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend index bc584462e3..148586e2c1 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend @@ -7,6 +7,8 @@ inherit systemd SRC_URI += "file://dnsmasq.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "dnsmasq.service" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend index 3d4d98bb1f..23e282000c 100644 --- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend @@ -10,6 +10,8 @@ SRC_URI += "file://dropbearkey.service \ file://dropbear.socket" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "dropbear.socket" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend index 394db215e4..50c6886fa5 100644 --- a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend +++ b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend @@ -10,6 +10,8 @@ inherit systemd NATIVE_SYSTEMD_SUPPORT = "1" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "cloud9.service" do_install_append() { install -d ${D}${systemd_unitdir}/system diff --git a/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend b/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend index 0dd3675a08..3d58a64c2e 100644 --- a/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend @@ -8,6 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://atd.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "atd.service" do_install_append() { install -d ${D}${systemd_unitdir}/system diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend index de3fe51ef5..e58306fcc9 100644 --- a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend @@ -10,6 +10,8 @@ SYSTEMD_PACKAGES = "atftpd" SYSTEMD_SERVICE_atftpd = "atftpd.service" FILES_atftpd += "${systemd_unitdir}/system/atftpd.service" RPROVIDES_atftpd += "atftpd-systemd" +RREPLACES_atftpd += "atftpd-systemd" +RCONFLICTS_atftpd += "atftpd-systemd" do_install_append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend index dfffccc620..c3538b3c64 100644 --- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend @@ -23,6 +23,10 @@ SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service" SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service" FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service" diff --git a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend index 42bcaa7942..6586809a2a 100644 --- a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend @@ -8,6 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://rpcbind.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "rpcbind.service" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend index 8404d01eb1..64ef39da1a 100644 --- a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend @@ -7,4 +7,6 @@ DEPENDS += "systemd" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.service" diff --git a/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend b/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend index 3b73354e3f..227c1c7c6c 100644 --- a/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend @@ -9,6 +9,8 @@ SRC_URI += " \ " RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "zram.service" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend index 697db03dc4..a3e97bb0bd 100644 --- a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend +++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend @@ -5,4 +5,6 @@ inherit systemd SYSTEMD_UNITDIR = "${systemd_unitdir}/system" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "lxdm.service" diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend index c7389d4eec..5c143467d5 100644 --- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend @@ -7,6 +7,8 @@ inherit systemd SRC_URI += "file://xinput-calibrator.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.service" do_install_append() { diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend index f5e98fd2dd..cae5a3c151 100644 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend +++ b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend @@ -16,6 +16,8 @@ do_install_append() { } RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" FILES_${PN} += "${sysconfdir}/default/xserver-nodm" diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend index 0d96a684c2..375e8556f8 100644 --- a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend +++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend @@ -7,6 +7,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://gpsd.service" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.socket" SYSTEMD_OESCONS = "true" diff --git a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend index 7763727d6b..0ed05df835 100644 --- a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend +++ b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend @@ -8,4 +8,6 @@ EXTRA_OECONF += " \ " RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.service" diff --git a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend index 7f1c6825ff..f8778015a2 100644 --- a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend +++ b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend @@ -3,4 +3,6 @@ inherit systemd PRINC := "${@int(PRINC) + 2}" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "pcscd.socket" diff --git a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend index 31db08a780..0a474fe3f5 100644 --- a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend +++ b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend @@ -5,4 +5,6 @@ PRINC := "${@int(PRINC) + 2}" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.service" diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend index a6b4da0eac..5f30216448 100644 --- a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +++ b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend @@ -10,5 +10,7 @@ DEPENDS += "systemd" SRC_URI += "file://add-systemd-support.patch" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend index 13a2ee453c..d3f4775b7c 100644 --- a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend @@ -3,6 +3,8 @@ PRINC := "${@int(PRINC) + 2}" inherit systemd RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "avahi-daemon.service" SYSTEMD_AUTO_ENABLE = "enable" diff --git a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend index 752e6c1951..495fffad21 100644 --- a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend @@ -5,5 +5,7 @@ inherit systemd EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "bluetooth.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend index 96a428f1da..61292adde1 100644 --- a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend @@ -1,4 +1,6 @@ PRINC := "${@int(PRINC) + 2}" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "connman.service" 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 \ diff --git a/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend b/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend index 94fce48a55..914117afb7 100644 --- a/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend @@ -3,5 +3,7 @@ PRINC := "${@int(PRINC) + 2}" inherit systemd RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "ofono.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend index 0d1bb56e85..fe61a89671 100644 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend @@ -6,6 +6,8 @@ SYSTEMD_PACKAGES = "openssh-sshd" SYSTEMD_SERVICE_openssh-sshd = "sshd.socket" FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket" RPROVIDES_openssh-sshd += "openssh-sshd-systemd" +RREPLACES_openssh-sshd += "openssh-sshd-systemd" +RCONFLICTS_openssh-sshd += "openssh-sshd-systemd" inherit systemd diff --git a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend index 784fc1f47c..b7ab2a4de5 100644 --- a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend @@ -5,6 +5,8 @@ PRINC := "${@int(PRINC) + 2}" inherit systemd RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "portmap.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend index dcd9b84e8e..cffb8985b9 100644 --- a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend @@ -1,3 +1,5 @@ PRINC := "${@int(PRINC) + 4}" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend index 12a9823c80..fae15a0548 100644 --- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend +++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend @@ -5,4 +5,6 @@ PRINC := "${@int(PRINC) + 2}" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}" RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "uuidd.socket" 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() { |