summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb11
-rwxr-xr-xmeta/recipes-kernel/oprofile/oprofileui-server/init (renamed from meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart)8
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server_git.bb13
3 files changed, 18 insertions, 14 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-kernel/oprofile/oprofileui-server/init
index db2668eb4e..2544ea4ac0 100755
--- a/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
+++ b/meta/recipes-kernel/oprofile/oprofileui-server/init
@@ -1,11 +1,11 @@
1#!/bin/sh 1#!/bin/sh
2### BEGIN INIT INFO 2### BEGIN INIT INFO
3# Provides: hddtemp 3# Provides: oprofile-server
4# Required-Start: $network 4# Required-Start: $network
5# Required-Stop: $network 5# Required-Stop: $network
6# Default-Start: 2 3 4 5 6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6 7# Default-Stop: 0 1 6
8# Short-Description: OProfile server 8# Short-Description: OProfileUI server
9# Description: 9# Description:
10### END INIT INFO 10### END INIT INFO
11 11
@@ -13,13 +13,13 @@
13 13
14case "$1" in 14case "$1" in
15 start) 15 start)
16 echo "Starting automatic qemu services" 16 echo "Starting OProfileUI server"
17 . /etc/profile 17 . /etc/profile
18 /usr/bin/oprofile-server & 18 /usr/bin/oprofile-server &
19 ;; 19 ;;
20 20
21 stop) 21 stop)
22 echo "Stopping qemu services" 22 echo "Stopping OProfileUI server"
23 killproc oprofile-server 23 killproc oprofile-server
24 ;; 24 ;;
25 25
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index b9f6a811e5..e75923f2a3 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -6,8 +6,19 @@ PR = "r0"
6 6
7S = "${WORKDIR}/git" 7S = "${WORKDIR}/git"
8 8
9SRC_URI = "git://git.yoctoproject.org/oprofileui;protocol=git" 9SRC_URI = "git://git.yoctoproject.org/oprofileui;protocol=git \
10 file://init"
10 11
11EXTRA_OECONF += "--disable-client --enable-server" 12EXTRA_OECONF += "--disable-client --enable-server"
12 13
13RDEPENDS_${PN} = "oprofile" 14RDEPENDS_${PN} = "oprofile"
15
16do_install_append() {
17 install -d ${D}${sysconfdir}/init.d
18 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/oprofileui-server
19}
20
21INITSCRIPT_NAME = "oprofileui-server"
22INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ."
23
24inherit update-rc.d