diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-03 14:45:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 12:53:07 +0100 |
commit | 54b8e84356b513b0fa6e5bcdfed75000ff8e0575 (patch) | |
tree | 7b0f81cadcfd7a8079ebcdba200af0603f8db6dc /meta/recipes-bsp | |
parent | c2e68c6fb9be169f274453412565cb6376770b2b (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config.bb | 11 | ||||
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop | 10 |
2 files changed, 1 insertions, 20 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)" | |||
10 | PR = "r25" | 10 | PR = "r25" |
11 | 11 | ||
12 | SRC_URI = "file://distcc.sh \ | 12 | SRC_URI = "file://distcc.sh \ |
13 | file://exports \ | 13 | file://exports" |
14 | file://shutdown.desktop" | ||
15 | 14 | ||
16 | S = "${WORKDIR}" | 15 | S = "${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 | |||
28 | pkg_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 | ||
33 | RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash" | 24 | RDEPENDS_${PN} = "distcc packagegroup-core-nfs-server oprofileui-server bash" |
diff --git a/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop b/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop deleted file mode 100644 index 272688922c..0000000000 --- a/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | [Desktop Entry] | ||
2 | Encoding=UTF-8 | ||
3 | Type=Application | ||
4 | Name=Shutdown | ||
5 | Comment=Close down the machine safely | ||
6 | Exec=halt | ||
7 | Icon=system-shutdown | ||
8 | Terminal=false | ||
9 | Categories=Utility; | ||
10 | StartupNotify=true \ No newline at end of file | ||