summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-03 14:45:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:53:07 +0100
commit54b8e84356b513b0fa6e5bcdfed75000ff8e0575 (patch)
tree7b0f81cadcfd7a8079ebcdba200af0603f8db6dc
parentc2e68c6fb9be169f274453412565cb6376770b2b (diff)
downloadpoky-54b8e84356b513b0fa6e5bcdfed75000ff8e0575.tar.gz
qemu-config: split out shutdown icon to its own recipe
Cleanly shutting down the machine from Sato is useful on other machines, not all of which have a power button that otherwise enables this, so make it not specific to qemu* and add it to task-core-x11-sato. (From OE-Core rev: 738005f4713c0da7bc04582a41efa956efdb9cc0) 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
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb1
-rw-r--r--meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb20
-rw-r--r--meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop (renamed from meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop)0
4 files changed, 22 insertions, 10 deletions
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 4179fc0492..06f2f326b4 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -10,8 +10,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
10PR = "r25" 10PR = "r25"
11 11
12SRC_URI = "file://distcc.sh \ 12SRC_URI = "file://distcc.sh \
13 file://exports \ 13 file://exports"
14 file://shutdown.desktop"
15 14
16S = "${WORKDIR}" 15S = "${WORKDIR}"
17 16
@@ -20,14 +19,6 @@ do_install() {
20 19
21 install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ 20 install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/
22 install -m 0644 exports ${D}${sysconfdir}/ 21 install -m 0644 exports ${D}${sysconfdir}/
23
24 install -d ${D}${datadir}/applications
25 install -m 0644 shutdown.desktop ${D}${datadir}/applications/
26}
27
28pkg_postinst_${PN} () {
29 grep -q qemuarm $D${sysconfdir}/hostname && \
30 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
31} 22}
32 23
33RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash" 24RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 5d781ae2fe..53e15d3550 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -37,6 +37,7 @@ RDEPENDS_${PN}-base = "\
37 sato-icon-theme \ 37 sato-icon-theme \
38 settings-daemon \ 38 settings-daemon \
39 gtk-sato-engine \ 39 gtk-sato-engine \
40 shutdown-desktop \
40 libsdl \ 41 libsdl \
41 ${NETWORK_MANAGER} \ 42 ${NETWORK_MANAGER} \
42 " 43 "
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
new file mode 100644
index 0000000000..d0f507e673
--- /dev/null
+++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Provides an icon to shut down the system cleanly"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5
6SRC_URI = "file://shutdown.desktop"
7
8S = "${WORKDIR}"
9
10do_install() {
11 install -d ${D}${datadir}/applications
12 install -m 0644 shutdown.desktop ${D}${datadir}/applications/
13}
14
15pkg_postinst_${PN} () {
16 grep -q qemuarm $D${sysconfdir}/hostname && \
17 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
18}
19
20inherit allarch
diff --git a/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
index 272688922c..272688922c 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop
+++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop