summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb7
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop10
2 files changed, 6 insertions, 11 deletions
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 70a113e8dc..ebf957a06a 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
5 5
6COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" 6COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
7 7
8PR = "r21" 8PR = "r22"
9 9
10SRC_URI = "file://distcc.sh \ 10SRC_URI = "file://distcc.sh \
11 file://anjuta-remote-run \ 11 file://anjuta-remote-run \
@@ -32,6 +32,11 @@ do_install() {
32 install qemu-autostart ${D}/etc/init.d/ 32 install qemu-autostart ${D}/etc/init.d/
33} 33}
34 34
35pkg_postinst_${PN} () {
36 grep -q qemuarm $D${sysconfdir}/hostname && \
37 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
38}
39
35RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash" 40RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
36 41
37inherit update-rc.d allarch 42inherit update-rc.d allarch
diff --git a/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop b/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
deleted file mode 100644
index b973d4318e..0000000000
--- a/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
1[Desktop Entry]
2Encoding=UTF-8
3Type=Application
4Name=Shutdown
5Comment=Close down the machine safely
6Exec=reboot
7Icon=system-shutdown
8Terminal=false
9Categories=Utility;
10StartupNotify=true \ No newline at end of file