From 738005f4713c0da7bc04582a41efa956efdb9cc0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 3 Sep 2012 14:45:40 +0100 Subject: 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. Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold --- meta/recipes-bsp/qemu-config/qemu-config.bb | 11 +---------- meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop | 10 ---------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop (limited to 'meta/recipes-bsp') 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)" PR = "r25" SRC_URI = "file://distcc.sh \ - file://exports \ - file://shutdown.desktop" + file://exports" S = "${WORKDIR}" @@ -20,14 +19,6 @@ do_install() { install -m 0755 distcc.sh ${D}${sysconfdir}/profile.d/ install -m 0644 exports ${D}${sysconfdir}/ - - install -d ${D}${datadir}/applications - install -m 0644 shutdown.desktop ${D}${datadir}/applications/ -} - -pkg_postinst_${PN} () { - grep -q qemuarm $D${sysconfdir}/hostname && \ - sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' } 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 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Shutdown -Comment=Close down the machine safely -Exec=halt -Icon=system-shutdown -Terminal=false -Categories=Utility; -StartupNotify=true \ No newline at end of file -- cgit 1.2.3-korg