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>
This commit is contained in:
parent
80de0f946b
commit
66934fc311
|
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
|
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
|
||||||
|
|
||||||
PR = "r21"
|
PR = "r22"
|
||||||
|
|
||||||
SRC_URI = "file://distcc.sh \
|
SRC_URI = "file://distcc.sh \
|
||||||
file://anjuta-remote-run \
|
file://anjuta-remote-run \
|
||||||
|
@ -32,6 +32,11 @@ do_install() {
|
||||||
install qemu-autostart ${D}/etc/init.d/
|
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"
|
RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
|
||||||
|
|
||||||
inherit update-rc.d allarch
|
inherit update-rc.d allarch
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in New Issue