summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-09-22 16:38:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 22:23:37 +0100
commitca64b2eb1f1fd3b298e9384752b2fd806f7e4a12 (patch)
treed846daf0b527f285a16ce6d590e670961cb713e1 /meta
parent60d0c57ed6e46826b4346b278cad4f819f75e674 (diff)
downloadpoky-ca64b2eb1f1fd3b298e9384752b2fd806f7e4a12.tar.gz
qemu-config: use pkg_postinst to generate the proper shutdown.desktop
[YOCTO #1507] We need to remove the file qemuarm/shutdown.desktop, or else, on qemuarm, due to the PACKAGE_ARCH overriding from all to qemuarm in base.bbclass, the generated deb file will be stored at tmp/deploy/deb/qemuarm/qemu-config_1.0-r21_allarch.deb rather than tmp/deploy/deb/all/qemu-config_1.0-r21_all.deb, and the package qemu-config won't be installable -- task-base finally rdepends on qemu-config, so we get the do_rootfs failure: The following packages have unmet dependencies: | task-base-extended: Depends: task-base but it is not going to be installed | E: Broken packages There is also a generic shutdown.desktop, we can keep it and use a proper pkg_postinst to cope with the case of qemuarm. (From OE-Core rev: 751212d5effdceab91d95705e647cf07e6820940) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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