summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-03 14:45:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:53:07 +0100
commitc2e68c6fb9be169f274453412565cb6376770b2b (patch)
treef694c8089f59ee9b551794adf74d1e8559ebad71 /meta/recipes-bsp
parent125650776991e40168dcab1dca372cc3ebe1d490 (diff)
downloadpoky-c2e68c6fb9be169f274453412565cb6376770b2b.tar.gz
oprofileui-server: move initscript from qemu-config
The qemu-config initscript was only starting oprofile-server, so move it to the oprofileui-server recipe. (From OE-Core rev: 3063126e2c8ec72e900a48f7048aaf9662606792) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb11
-rwxr-xr-xmeta/recipes-bsp/qemu-config/qemu-config/qemu-autostart37
2 files changed, 2 insertions, 46 deletions
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 6775af34e3..4179fc0492 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -11,8 +11,7 @@ PR = "r25"
11 11
12SRC_URI = "file://distcc.sh \ 12SRC_URI = "file://distcc.sh \
13 file://exports \ 13 file://exports \
14 file://shutdown.desktop \ 14 file://shutdown.desktop"
15 file://qemu-autostart"
16 15
17S = "${WORKDIR}" 16S = "${WORKDIR}"
18 17
@@ -24,9 +23,6 @@ do_install() {
24 23
25 install -d ${D}${datadir}/applications 24 install -d ${D}${datadir}/applications
26 install -m 0644 shutdown.desktop ${D}${datadir}/applications/ 25 install -m 0644 shutdown.desktop ${D}${datadir}/applications/
27
28 install -d ${D}${sysconfdir}/init.d
29 install qemu-autostart ${D}${sysconfdir}/init.d/
30} 26}
31 27
32pkg_postinst_${PN} () { 28pkg_postinst_${PN} () {
@@ -36,7 +32,4 @@ pkg_postinst_${PN} () {
36 32
37RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash" 33RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash"
38 34
39inherit update-rc.d allarch 35inherit allarch
40
41INITSCRIPT_NAME = "qemu-autostart"
42INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart b/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
deleted file mode 100755
index db2668eb4e..0000000000
--- a/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
+++ /dev/null
@@ -1,37 +0,0 @@
1#!/bin/sh
2### BEGIN INIT INFO
3# Provides: hddtemp
4# Required-Start: $network
5# Required-Stop: $network
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: OProfile server
9# Description:
10### END INIT INFO
11
12. /etc/init.d/functions
13
14case "$1" in
15 start)
16 echo "Starting automatic qemu services"
17 . /etc/profile
18 /usr/bin/oprofile-server &
19 ;;
20
21 stop)
22 echo "Stopping qemu services"
23 killproc oprofile-server
24 ;;
25
26 restart)
27 $0 stop
28 sleep 1
29 $0 start
30 ;;
31
32 *)
33 echo "usage: $0 { start | stop | restart }"
34 ;;
35esac
36
37exit 0