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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

4 files changed, 16 insertions, 27 deletions

diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf
index 3c0582a87e..3c0582a87e 100644
--- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf
diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
index 53e61d7653..53e61d7653 100644
--- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 544ae7f8c1..bbed445fe3 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -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"
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
deleted file mode 100644
index cae5a3c151..0000000000
--- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
+++ /dev/null
@@ -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"