From 365d5ec941347f54744b9f5fbb7b06cc3949e14a Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:50 +0000 Subject: gateone: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-oe/recipes-connectivity/gateone/gateone/gateone.service | 10 ---------- meta-oe/recipes-connectivity/gateone/gateone_git.bb | 9 ++------- .../recipes-connectivity/gateone/gateone/gateone.service | 10 ++++++++++ .../meta-oe/recipes-connectivity/gateone/gateone_git.bbappend | 11 +++++++++++ 4 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/gateone/gateone/gateone.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend diff --git a/meta-oe/recipes-connectivity/gateone/gateone/gateone.service b/meta-oe/recipes-connectivity/gateone/gateone/gateone.service deleted file mode 100644 index 7ff60020a0..0000000000 --- a/meta-oe/recipes-connectivity/gateone/gateone/gateone.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=GateOne daemon -ConditionPathExists=|/var/lib/gateone - -[Service] -WorkingDirectory=/var/lib/gateone -ExecStart=/usr/bin/python gateone.py - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb index 12f4e5107a..f6aa3776d6 100644 --- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb +++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb @@ -2,19 +2,18 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c" -PR = "r7" +PR = "r8" PV = "1.1" SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46" SRC_URI = "git://github.com/liftoff/GateOne.git \ file://gateone-avahi.service \ - file://gateone.service \ file://server.conf \ " S = "${WORKDIR}/git" -inherit distutils allarch systemd +inherit distutils allarch export prefix = "${localstatedir}/lib" @@ -27,10 +26,6 @@ do_install_append() { install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf } -NATIVE_SYSTEMD_SUPPORT = "1" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE = "gateone.service" - FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${base_libdir} ${sysconfdir}" RDEPENDS_${PN} = "file \ mime-support \ diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service new file mode 100644 index 0000000000..7ff60020a0 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service @@ -0,0 +1,10 @@ +[Unit] +Description=GateOne daemon +ConditionPathExists=|/var/lib/gateone + +[Service] +WorkingDirectory=/var/lib/gateone +ExecStart=/usr/bin/python gateone.py + +[Install] +WantedBy=multi-user.target diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend new file mode 100644 index 0000000000..dd5fea1a96 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +SRC_URI += "file://gateone.service" + +NATIVE_SYSTEMD_SUPPORT = "1" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE = "gateone.service" -- cgit v1.2.3-54-g00ecf