From a0b13fc0e549390c8e2e24004117d0275a0bb966 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 14 Nov 2011 15:08:50 +0100
Subject: bonescript, beaglebone-getting-started: move bone101 startup to
 proper recipe

Also bump SRCREV

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 recipes-misc/payload/beaglebone-getting-started.bb        | 13 +++----------
 .../payload/beaglebone-getting-started/bone101.service    | 11 -----------
 recipes-misc/payload/bonescript.bb                        | 15 +++++++++++----
 recipes-misc/payload/bonescript/bone101.service           | 11 +++++++++++
 4 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 recipes-misc/payload/beaglebone-getting-started/bone101.service
 create mode 100644 recipes-misc/payload/bonescript/bone101.service

diff --git a/recipes-misc/payload/beaglebone-getting-started.bb b/recipes-misc/payload/beaglebone-getting-started.bb
index ea5b038a..81d8ceda 100644
--- a/recipes-misc/payload/beaglebone-getting-started.bb
+++ b/recipes-misc/payload/beaglebone-getting-started.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "BeagleBone Getting Started Guide"
 
-PR = "r11"
+PR = "r12"
 
 inherit allarch
 
@@ -8,20 +8,13 @@ LICENSE = "GPLv2+ && MIT && PD && others"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=603591dea023c3c75b48e07cb47ce639"
 
 SRCREV = "70ff0ec0e2d44de35824577ab7b6da443dcc0e9a"
-SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git \
-           file://bone101.service"
+SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git"
 
 S = "${WORKDIR}/git"
 
 do_install() {
 	install -d ${D}${datadir}/${PN}
 	cp -a ${S}/* ${D}${datadir}/${PN}
-
-	install -d ${D}${base_libdir}/systemd/system
-	install -m 0644 ${WORKDIR}/bone101.service ${D}${base_libdir}/systemd/system
 }
 
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "bone101.service"
-
-FILES_${PN} += "${datadir}/${PN} ${base_libdir}/systemd/system"
+FILES_${PN} += "${datadir}/${PN}"
diff --git a/recipes-misc/payload/beaglebone-getting-started/bone101.service b/recipes-misc/payload/beaglebone-getting-started/bone101.service
deleted file mode 100644
index 49562ba4..00000000
--- a/recipes-misc/payload/beaglebone-getting-started/bone101.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Beaglebone 101 presentation
-ConditionPathExists=|/var/lib/cloud9
-
-[Service]
-WorkingDirectory=/var/lib/cloud9
-ExecStart=/usr/bin/node bone101.js
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/recipes-misc/payload/bonescript.bb b/recipes-misc/payload/bonescript.bb
index bbce0223..d9e3b018 100644
--- a/recipes-misc/payload/bonescript.bb
+++ b/recipes-misc/payload/bonescript.bb
@@ -1,16 +1,17 @@
 DESCRIPTION = "Scripting tools for the BeagleBoard and BeagleBone"
 
-PR = "r6"
+PR = "r8"
 
-inherit allarch
+inherit allarch systemd
 
 # Ask Jason
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-SRCREV = "0b264f3144cb6385e33346dec02692d71844898d"
+SRCREV = "c6c5f3b013eea425d3f4ee64d58b993289d2530f"
 SRC_URI = "git://github.com/jadonk/bonescript.git \
            file://bonescript-git \
+           file://file://bone101.service \
           "
 S = "${WORKDIR}/git"
 
@@ -23,8 +24,14 @@ do_install() {
 	install -d ${D}${localstatedir}/lib/cloud9/
 	cp -a ${S}/* ${D}${localstatedir}/lib/cloud9/
 	cp -a ${S}/.git ${D}${localstatedir}/lib/cloud9/
+
+	install -d ${D}${base_libdir}/systemd/system
+	install -m 0644 ${WORKDIR}/bone101.service ${D}${base_libdir}/systemd/system
 }
 
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "bone101.service"
+
+FILES_${PN} += ""${localstatedir} ${base_libdir}/systemd/system"
 RDEPENDS_${PN} = "nodejs cloud9"
 RRECOMMENDS_${PN} = "git"
-FILES_${PN} += "${localstatedir}"
diff --git a/recipes-misc/payload/bonescript/bone101.service b/recipes-misc/payload/bonescript/bone101.service
new file mode 100644
index 00000000..49562ba4
--- /dev/null
+++ b/recipes-misc/payload/bonescript/bone101.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Beaglebone 101 presentation
+ConditionPathExists=|/var/lib/cloud9
+
+[Service]
+WorkingDirectory=/var/lib/cloud9
+ExecStart=/usr/bin/node bone101.js
+
+[Install]
+WantedBy=multi-user.target
+
-- 
cgit v1.2.3-54-g00ecf