diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 13:58:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:03 +0200 |
commit | eb0e685982643787b5c4787a2640a1b92102b35e (patch) | |
tree | 547d9ab1a4a13f5219a39a7a99886b6f6b3808b2 | |
parent | 17c747d85e155f3eb2fab97c5a1ad66a68d809bc (diff) | |
download | meta-openembedded-contrib-eb0e685982643787b5c4787a2640a1b92102b35e.tar.gz |
cloud9: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service (renamed from meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 13 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend | 20 |
3 files changed, 12 insertions, 21 deletions
diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service index 495b131ffa..495b131ffa 100644 --- a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service +++ b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb index 0c07b128bb..9ae25bb650 100644 --- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb +++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb @@ -3,11 +3,13 @@ HOMEPAGE = "http://c9.io" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018" -PR = "r2" +PR = "r4" # Nodejs-native for node-waf, nodejs4-native for the headers DEPENDS = "libxml2 nodejs-native nodejs4-native" +inherit systemd + SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \ git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \ git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \ @@ -33,6 +35,7 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \ git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \ file://index.js \ file://cloud9-avahi.service \ + file://cloud9.service \ file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \ " @@ -97,6 +100,9 @@ do_install () { install -m 0755 -d ${D}${sysconfdir}/avahi/services/ install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system } FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \ @@ -104,3 +110,8 @@ FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o " RDEPENDS_${PN} = "nodejs4 nodejs gzip" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "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 deleted file mode 100644 index 50c6886fa5..0000000000 --- a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 3}" - -inherit systemd - -SRC_URI += "file://cloud9.service" - -inherit systemd - -NATIVE_SYSTEMD_SUPPORT = "1" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "cloud9.service" -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system -} - |