mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

meta-systemd: Append ${PN} to SYSTEMD_SERVICE

Browse Source 
When using systemd class from OE-Core we also need
to install the units explicitly.

systemd packages ending with -systemd are consumed
and now provided by package proper.

MJ: fix RPROVIDES_PN = PN-systemd in entrance
MJ: add RPROVIDES for ntp*-systemd in ntp
MJ: the same for wpa-supplicant

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2013-02-13 17:25:35 +00:00
committed by Martin Jansa
parent 0afa2a51d2
commit 313f0ae259
41 changed files with 246 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
+4 -3
View File
@@ -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/"
meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
+3 -2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend
+3 -2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend
+18 -4
View File
@@ -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
}
meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend
+3 -2
View File
@@ -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"
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend
+11 -2
View File
@@ -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
}
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
+8 -2
View File
@@ -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
}
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
+2 -14
View File
@@ -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"
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
+3 -2
View File
@@ -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"
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
+7
View File
@@ -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
}