summaryrefslogtreecommitdiff
path: root/meta/recipes-bsp
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 21:46:54 +0100
commit751212d5effdceab91d95705e647cf07e6820940 (patch)
tree47d2b5c567b5cbd30e5ee3ca970662cb36033d52 /meta/recipes-bsp
parent5eaed4bba35e8188855acb93344adf48201748a2 (diff)
downloadopenembedded-core-751212d5effdceab91d95705e647cf07e6820940.tar.gz
openembedded-core-751212d5effdceab91d95705e647cf07e6820940.tar.bz2
openembedded-core-751212d5effdceab91d95705e647cf07e6820940.tar.xz
openembedded-core-751212d5effdceab91d95705e647cf07e6820940.zip
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. Signed-off-by: Dexuan Cui <dexuan.cui@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.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 70a113e8d..ebf957a06 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
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
-PR = "r21"
+PR = "r22"
SRC_URI = "file://distcc.sh \
file://anjuta-remote-run \
@@ -32,6 +32,11 @@ do_install() {
install qemu-autostart ${D}/etc/init.d/
}
+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 dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
inherit 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 b973d4318..000000000
--- a/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Shutdown
-Comment=Close down the machine safely
-Exec=reboot
-Icon=system-shutdown
-Terminal=false
-Categories=Utility;
-StartupNotify=true \ No newline at end of file