mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 20:07: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/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
+7 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
+1 -2
View File
@@ -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
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend
+3 -3
View File
@@ -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"
meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
+7 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
+6
View File
@@ -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
}
meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
+7 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.9.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
+11 -2
View File
@@ -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"
meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
+8 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
+3 -2
View File
@@ -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"
meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
+3 -2
View File
@@ -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"
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+9 -2
View File
@@ -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
}
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
+7 -4
View File
@@ -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"
meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
+3 -2
View File
@@ -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() {
meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
+3 -2
View File
@@ -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"
meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
+3 -2
View File
@@ -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"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
+3 -2
View File
@@ -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"
meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
+3 -2
View File
@@ -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"