mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

meta-systemd: Add not only RPROVIDES, but also RREPLACES/RCONFLICTS

Browse Source 
with this combo opkg should automatically remove PN-systemd and replace it with PN
This commit is contained in:
Martin Jansa
2013-04-12 13:43:14 +02:00
parent 1482cfe735
commit 739fc97599
37 changed files with 82 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+2
View File
@@ -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"
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
+2
View File
@@ -15,4 +15,6 @@ do_install_append() {
}
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "gdm.service"
meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
+2
View File
@@ -11,4 +11,6 @@ do_install_append() {
}
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "mpd.service"
meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
+2
View File
@@ -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"
meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
+2
View File
@@ -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
meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
+4
View File
@@ -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"
meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
+2
View File
@@ -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
meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
+2
View File
@@ -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
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
+2
View File
@@ -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
meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
+4
View File
@@ -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"
meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
+2
View File
@@ -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"
meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
+2
View File
@@ -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"
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
+2
View File
@@ -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"
meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
+2
View File
@@ -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"
meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
+2
View File
@@ -8,4 +8,6 @@ EXTRA_OECONF += " \
"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "${PN}.service"
meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
+2
View File
@@ -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"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
+2
View File
@@ -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"
meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend
+6
View File
@@ -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 \
meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend
+2
View File
@@ -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
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
+2
View File
@@ -1,3 +1,5 @@
PRINC := "${@int(PRINC) + 4}"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend
+2
View File
@@ -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"
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
+2
View File
@@ -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() {