diff options
41 files changed, 246 insertions, 100 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 df96e3495d..8f85ab7592 100644 --- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend +++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend @@ -1,13 +1,19 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" inherit systemd SRC_URI += "file://entrance.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "entrance.service" +RPROVIDES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd" -RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd" +SYSTEMD_SERVICE_${PN} = "entrance.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system +} + +RCONFLICTS_${PN} += "xserver-nodm-init-systemd" +RREPLACES_${PN} += "xserver-nodm-init-systemd" 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 45b47c3365..6ea753df08 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 @@ -14,5 +14,6 @@ do_install_append() { > ${D}${systemd_unitdir}/system/gdm.service } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "gdm.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 eee4cdd3ac..e19723ae14 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 @@ -10,5 +10,6 @@ do_install_append() { ${D}/${systemd_unitdir}/system/mpd.service } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "mpd.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 3d318fb3be..f6792f13d1 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 @@ -2,5 +2,6 @@ inherit systemd PRINC := "${@int(PRINC) + 1}" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "autofs.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 041ca830e7..76dd4bae7f 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 @@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://domainname.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "domainname.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "domainname.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system +} 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 14dbaacbba..cd3b98e3c0 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 @@ -7,6 +7,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://ypbind.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "ypbind.service" - +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "ypbind.service" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ypbind.service ${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 c6cd03147f..82e8621b10 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 @@ -4,9 +4,13 @@ PRINC := "${@int(PRINC) + 1}" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service" -SYSTEMD_SERVICE_ntpdate-systemd = "ntpdate.service" +SYSTEMD_PACKAGES = "${PN} ntpdate" +SYSTEMD_SERVICE_${PN} = "ntpd.service" +SYSTEMD_SERVICE_ntpdate = "ntpdate.service" +RPROVIDES_${PN} += "${PN}-systemd" +RPROVIDES_ntpdate += "ntpdate-systemd" + +FILES_ntpdate += "${systemd_unitdir}/system/ntpdate.service" SRC_URI += " \ file://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 7f336a18ad..c8d0d3d6ce 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 @@ -4,5 +4,12 @@ PRINC := "${@int(PRINC) + 6}" SRC_URI += " file://keymaps.service" inherit systemd -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system +} + 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 7cc7dd8474..c8571b743c 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 @@ -6,5 +6,12 @@ inherit systemd SRC_URI += "file://cherokee.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "cherokee.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "cherokee.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system +} + 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 0a9c77ec78..799b3cdfc8 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 @@ -6,5 +6,12 @@ inherit systemd SRC_URI += "file://dnsmasq.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "dnsmasq.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "dnsmasq.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system +} + diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend index dd5fea1a96..489528b6a3 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend @@ -7,5 +7,10 @@ inherit systemd SRC_URI += "file://gateone.service" NATIVE_SYSTEMD_SUPPORT = "1" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE = "gateone.service" +SYSTEMD_SERVICE_${PN} = "gateone.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system +} + diff --git a/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend b/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend index 6ae5d7523d..0510b232c6 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend @@ -4,8 +4,7 @@ inherit systemd DEPENDS += "systemd" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE = "NetworkManager.service" +SYSTEMD_SERVICE_${PN} = "NetworkManager.service" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" # NetworkManager-wait-online is not catched by systemd.bbclass diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend index a0ae2ce186..c2121040f8 100644 --- a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend +++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend @@ -8,8 +8,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://busybox-syslog.service.in \ file://busybox-klogd.service.in" -SYSTEMD_PACKAGES = "${PN}-syslog-systemd" -SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service" +SYSTEMD_PACKAGES = "${PN}-syslog" +SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" do_install_append() { install -d ${D}${systemd_unitdir}/system @@ -20,4 +20,4 @@ do_install_append() { ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service } -FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service" +FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service" 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 15546e1ad6..c46e981807 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 @@ -9,9 +9,14 @@ SRC_URI += "file://dropbearkey.service \ file://dropbear@.service \ file://dropbear.socket" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "dropbear.socket" do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service } 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 afa85bf17a..03d878e886 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,4 +10,10 @@ inherit systemd NATIVE_SYSTEMD_SUPPORT = "1" SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "cloud9.service" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/cloud9.service ${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 d80cfff2ed..2e63c69e8a 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 @@ -7,6 +7,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://atd.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "atd.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "atd.service" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/atd.service ${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 3706d9f2b2..9707abf856 100644 --- a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend @@ -6,5 +6,12 @@ inherit systemd SRC_URI += "file://atftpd.service" -SYSTEMD_PACKAGES = "atftpd-systemd" -SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service" +SYSTEMD_PACKAGES = "atftpd" +SYSTEMD_SERVICE_atftpd = "atftpd.service" +FILES_atftpd += "${systemd_unitdir}/system/atftpd.service" +RPROVIDES_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/cronie/cronie_1.4.9.bbappend b/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend index 66db46674e..0ffba654a2 100644 --- a/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend +++ b/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend @@ -5,7 +5,14 @@ PRINC := "${@int(PRINC) + 3}" inherit systemd -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "crond.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "crond.service" SRC_URI += "file://crond.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/crond.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 f221c1d7d9..dfe68f20d5 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 @@ -9,11 +9,20 @@ SRC_URI += " \ file://snmpd.service \ file://snmptrapd.service \ " +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system +} EXTRA_OECONF += "--with-systemd" SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ ${PN}-server-snmptrapd-systemd" -SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service" -SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd = "snmptrapd.service" +SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service" +SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" +RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RPROVIDES_${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 0fa7f97610..fb31f9234d 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 @@ -7,6 +7,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://rpcbind.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "rpcbind.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "rpcbind.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system +} 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 b813a5083e..85d99ed72f 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 @@ -6,5 +6,6 @@ DEPENDS += "systemd" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 cc98fe1c97..34b82f72f4 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 @@ -8,5 +8,12 @@ SRC_URI += " \ file://zram.service \ " -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "zram.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "zram.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system +} + 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 2828a7034f..6fe4b9fac3 100644 --- a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend +++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend @@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}" inherit systemd SYSTEMD_UNITDIR = "${systemd_unitdir}/system" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "lxdm.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 5bc5bc3848..5f829acf04 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 @@ -6,5 +6,12 @@ inherit systemd SRC_URI += "file://xinput-calibrator.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system +} + 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 b6b77c914a..9310513878 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 @@ -10,12 +10,15 @@ SRC_URI += "file://xserver-nodm.service \ do_install_append() { install -d ${D}${sysconfdir}/default + install -d ${D}${systemd_unitdir}/system install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm + install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" -FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm" +FILES_${PN} += "${sysconfdir}/default/xserver-nodm" -RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit" +RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit" 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 9504761574..23e0bc3187 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 @@ -6,8 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://gpsd.service" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.socket" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.socket" SYSTEMD_OESCONS = "true" do_install_append() { 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 92c2e77e6c..95e2f7a493 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 @@ -7,5 +7,6 @@ EXTRA_OECONF += " \ --with-systemdsystemunitdir=${systemd_unitdir}/system \ " -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 b8150b7f76..74e5ae82db 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 @@ -2,5 +2,6 @@ inherit systemd PRINC := "${@int(PRINC) + 1}" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "pcscd.socket" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 a60a109afd..5334fff1ff 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 @@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 9d0f18c7a0..87eb3bb914 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 @@ -9,6 +9,7 @@ DEPENDS += "systemd" SRC_URI += "file://add-systemd-support.patch" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 d41ca93bfc..ec0f08d93b 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 @@ -2,8 +2,9 @@ PRINC := "${@int(PRINC) + 1}" inherit systemd -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "avahi-daemon.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "avahi-daemon.service" SYSTEMD_AUTO_ENABLE = "enable" -FILES_${PN}-systemd += "${systemd_unitdir}/system/" +FILES_${PN} += "${systemd_unitdir}/system/" 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 8945a6da79..004c4945a9 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 @@ -4,6 +4,7 @@ inherit systemd EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "bluetooth.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 b94f84b2f9..37c0d29198 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,5 @@ PRINC := "${@int(PRINC) + 1}" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "connman.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 fde2426593..aec1dfbe94 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 @@ -5,12 +5,26 @@ inherit systemd PRINC := "${@int(PRINC) + 1}" -SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd dhcp-client-systemd" -SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service" -SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service" -SYSTEMD_SERVICE_dhcp-client-systemd = "dhclient.service" +SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" +SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" +SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" +SYSTEMD_SERVICE_dhcp-client = "dhclient.service" + +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" +RPROVIDES_dhcp-relay += "dhcp-relay-systemd" +RPROVIDES_dhcp-client += "dhcp-client-systemd" SRC_URI += "file://dhcpd.service \ file://dhclient.service \ file://dhcrelay.service \ " +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system +} + 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 a061b52c58..9923708019 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 @@ -2,6 +2,7 @@ PRINC := "${@int(PRINC) + 1}" inherit systemd -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "ofono.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${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 a4590657d8..fe5c919063 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 @@ -2,9 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PRINC := "${@int(PRINC) + 1}" -SYSTEMD_PACKAGES = "openssh-sshd-systemd" -SYSTEMD_SERVICE = "sshd.socket" +SYSTEMD_PACKAGES = "openssh-sshd" +SYSTEMD_SERVICE_openssh-sshd = "sshd.socket" +FILES_openssh-sshd += "${systemd_unitdir}/system/sshd.socket" +RPROVIDES_openssh-sshd += "openssh-sshd-systemd" inherit systemd SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system +} + 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 c0276a391b..281c44043b 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 @@ -4,8 +4,14 @@ PRINC := "${@int(PRINC) + 1}" inherit systemd -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "portmap.service" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "portmap.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI_append = " file://portmap.service" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system +} + 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 a94b00725a..d0ce87eb03 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,15 +1,3 @@ -PRINC := "${@int(PRINC) + 2}" +PRINC := "${@int(PRINC) + 3}" -inherit systemd - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "wpa_supplicant.service" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install_append () { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}${systemd_unitdir}/system -} - -# systemd.bbclass does not catch all multiple-instance-service-files -FILES_${PN}-systemd += "${systemd_unitdir}/system/" +RPROVIDES_${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 809a554390..e0b1abaf73 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 @@ -4,5 +4,6 @@ PRINC := "${@int(PRINC) + 1}" SYSTEMD_UNITDIR = "${systemd_unitdir}/system" EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}" -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "uuidd.socket" +SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "uuidd.socket" 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 0e08358b29..89079dcae1 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,4 +7,11 @@ inherit systemd SRC_URI += "file://lighttpd.service" SYSTEMD_PACKAGES = "${PN}" +RPROVIDES_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "lighttpd.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +} + diff --git a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb index f33b2a9833..3b3c1dcac1 100644 --- a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb @@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r1" inherit systemd -SYSTEMD_SERVICE = "" +SYSTEMD_SERVICE_${PN} = "" SYSTEMD_PACKAGES = "${PN}" NATIVE_SYSTEMD_SUPPORT = "1" ALLOW_EMPTY_${PN} = "1" |