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

xserver-nodm-init: move systemd support from meta-systemd back to meta-oe

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2013-04-13 14:32:42 +02:00
parent e965f6efc0
commit 05c8eb4393
4 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf → meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf
View File
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service → meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
View File
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+16 -2
View File
@@ -3,14 +3,16 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
PR = "r17"
PR = "r21"
SRC_URI = "file://xserver-nodm \
file://gplv2-license.patch \
file://xserver-nodm.service \
file://xserver-nodm.conf \
"
S = "${WORKDIR}"
inherit allarch update-rc.d
inherit allarch update-rc.d systemd
INITSCRIPT_NAME = "xserver-nodm"
INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
@@ -19,6 +21,18 @@ INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
do_install() {
install -d ${D}${sysconfdir}/init.d
install xserver-nodm ${D}${sysconfdir}/init.d
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
}
RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
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-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
-25
View File
@@ -1,25 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 3}"
inherit systemd
SRC_URI += "file://xserver-nodm.service \
file://xserver-nodm.conf \
"
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
}
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
FILES_${PN} += "${sysconfdir}/default/xserver-nodm"
RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit"