* [PATCH 0/1] fix to bug 1507 @ 2011-09-22 8:38 Dexuan Cui 2011-09-22 8:38 ` [PATCH 1/1] qemu-config: use pkg_postinst to generate the proper shutdown.desktop Dexuan Cui 2011-09-23 2:09 ` [PATCH 0/1] fix to bug 1507 Saul Wold 0 siblings, 2 replies; 3+ messages in thread From: Dexuan Cui @ 2011-09-22 8:38 UTC (permalink / raw) To: openembedded-core Thanks a lot for RP's suggestion about how to make the patch. The following changes since commit 468e4a2f0e63e9d33e88b98a7d075b186ef481b2: glib-2.0: Drop old 2.27.5 development version (2011-09-22 08:47:22 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib dcui/bug-1507 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/bug-1507 Dexuan Cui (1): qemu-config: use pkg_postinst to generate the proper shutdown.desktop meta/recipes-bsp/qemu-config/qemu-config.bb | 7 ++++++- .../qemu-config/qemuarm/shutdown.desktop | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop -- 1.7.6 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] qemu-config: use pkg_postinst to generate the proper shutdown.desktop 2011-09-22 8:38 [PATCH 0/1] fix to bug 1507 Dexuan Cui @ 2011-09-22 8:38 ` Dexuan Cui 2011-09-23 2:09 ` [PATCH 0/1] fix to bug 1507 Saul Wold 1 sibling, 0 replies; 3+ messages in thread From: Dexuan Cui @ 2011-09-22 8:38 UTC (permalink / raw) To: openembedded-core [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> --- meta/recipes-bsp/qemu-config/qemu-config.bb | 7 ++++++- .../qemu-config/qemuarm/shutdown.desktop | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb index 70a113e..ebf957a 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 b973d43..0000000 --- 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 -- 1.7.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1] fix to bug 1507 2011-09-22 8:38 [PATCH 0/1] fix to bug 1507 Dexuan Cui 2011-09-22 8:38 ` [PATCH 1/1] qemu-config: use pkg_postinst to generate the proper shutdown.desktop Dexuan Cui @ 2011-09-23 2:09 ` Saul Wold 1 sibling, 0 replies; 3+ messages in thread From: Saul Wold @ 2011-09-23 2:09 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 09/22/2011 01:38 AM, Dexuan Cui wrote: > Thanks a lot for RP's suggestion about how to make the patch. > > The following changes since commit 468e4a2f0e63e9d33e88b98a7d075b186ef481b2: > > glib-2.0: Drop old 2.27.5 development version (2011-09-22 08:47:22 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib dcui/bug-1507 > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/bug-1507 > > Dexuan Cui (1): > qemu-config: use pkg_postinst to generate the proper shutdown.desktop > > meta/recipes-bsp/qemu-config/qemu-config.bb | 7 ++++++- > .../qemu-config/qemuarm/shutdown.desktop | 10 ---------- > 2 files changed, 6 insertions(+), 11 deletions(-) > delete mode 100644 meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-23 2:14 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-09-22 8:38 [PATCH 0/1] fix to bug 1507 Dexuan Cui 2011-09-22 8:38 ` [PATCH 1/1] qemu-config: use pkg_postinst to generate the proper shutdown.desktop Dexuan Cui 2011-09-23 2:09 ` [PATCH 0/1] fix to bug 1507 Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox