Patchwork [RFC,meta-oe,20/27] cloud9: move systemd support to meta-systemd

login
register
mail settings
Submitter Andreas Müller
Date June 10, 2012, 9:46 p.m.
Message ID <1339364820-2880-21-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/29615/
State Superseded
Headers show

Comments

Andreas Müller - June 10, 2012, 9:46 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb      |    9 +--------
 .../recipes-devtools/cloud9/cloud9/cloud9.service  |    0
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |   13 +++++++++++++
 3 files changed, 14 insertions(+), 8 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-devtools/cloud9/cloud9/cloud9.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend

Patch

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index 0f0c09c..a78c653 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -3,7 +3,7 @@  HOMEPAGE = "http://c9.io"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libxml2 nodejs-native"
 
@@ -31,7 +31,6 @@  SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
            git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
            file://index.js \
-           file://cloud9.service \
            file://cloud9-avahi.service \
            file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
           "
@@ -104,9 +103,3 @@  FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
                    "
 
 RDEPENDS_${PN} = "nodejs4 nodejs gzip"
-
-inherit systemd
-
-NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "cloud9.service"
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
similarity index 100%
rename from meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
rename to meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
new file mode 100644
index 0000000..7424a89
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
@@ -0,0 +1,13 @@ 
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://cloud9.service"
+
+inherit systemd
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "cloud9.service"