[oe] [meta-systemd][PATCH 22/33] gateone: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../recipes-connectivity/gateone/gateone/gateone.service |  0
 meta-oe/recipes-connectivity/gateone/gateone_git.bb      | 10 ++++++++--
 .../recipes-connectivity/gateone/gateone_git.bbappend    | 16 ----------------
 3 files changed, 8 insertions(+), 18 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-connectivity/gateone/gateone/gateone.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend

diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service b/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
rename to meta-oe/recipes-connectivity/gateone/gateone/gateone.service
diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index e9c182d..3552009 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,18 +2,19 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
 
-PR = "r10"
+PR = "r13"
 
 PV = "1.1"
 SRCREV = "ea5db3dcb3bbbe445ae6d1a5611c1f8d547c57b9"
 SRC_URI = "git://github.com/liftoff/GateOne.git \
            file://gateone-avahi.service \
            file://server.conf \
+           file://gateone.service \
           "
 
 S = "${WORKDIR}/git"
 
-inherit distutils allarch python-dir
+inherit distutils allarch python-dir systemd
 
 export prefix = "${localstatedir}/lib"
 
@@ -24,6 +25,9 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/
 
 	install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf
+	
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
 }
 
 FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${localstatedir}/volatile/log ${base_libdir} ${sysconfdir} ${PYTHON_SITEPACKAGES_DIR}"
@@ -57,3 +61,5 @@ RDEPENDS_${PN} = "file \
                   python-unixadmin \
                   python-xml \
                  "
+
+SYSTEMD_SERVICE_${PN} = "gateone.service"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
deleted file mode 100644
index 8ec9dfa..0000000
--- a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += "file://gateone.service"
-
-NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_SERVICE_${PN} = "gateone.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5