diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2011-09-22 16:38:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 22:23:37 +0100 |
commit | ca64b2eb1f1fd3b298e9384752b2fd806f7e4a12 (patch) | |
tree | d846daf0b527f285a16ce6d590e670961cb713e1 /meta/recipes-bsp/qemu-config/qemu-config | |
parent | 60d0c57ed6e46826b4346b278cad4f819f75e674 (diff) | |
download | poky-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/recipes-bsp/qemu-config/qemu-config')
-rw-r--r-- | meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop | 10 |
1 files changed, 0 insertions, 10 deletions
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] | ||
2 | Encoding=UTF-8 | ||
3 | Type=Application | ||
4 | Name=Shutdown | ||
5 | Comment=Close down the machine safely | ||
6 | Exec=reboot | ||
7 | Icon=system-shutdown | ||
8 | Terminal=false | ||
9 | Categories=Utility; | ||
10 | StartupNotify=true \ No newline at end of file | ||