building qemu inside qemuppc/x86, Edwin, Aug 15, 2011
cover building qemu inside qemuppc/x86, Edwin, Aug 15, 2011
From: Zhai Edwin <[email protected]>
This patch makes qemu can be built inside qemuppc/x86, so that world build is happy. Also add some distro-trackings update.
Pls. help to review and pull.
Thanks,
Edwin
The following changes since commit d31d5e5b34c889809af408aed7d4f353d0133750:
gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 21:23:58 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2
Zhai Edwin (2):
distro-tracking: Update info for gpgme, libassuan, apr... after last
upgrade.
qemu: Make qemu buildable inside qemux86/qemuppc target
.../conf/distro/include/distro_tracking_fields.inc | 48 ++++++++++--------- meta/recipes-devtools/qemu/qemu.inc | 5 +- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 27 +++++++++-- 3 files changed, 49 insertions(+), 31 deletions(-)
PATCH 1/2 distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade.
From: Zhai Edwin <[email protected]>
--- .../conf/distro/include/distro_tracking_fields.inc | 48 ++++++++++--------- 1 files changed, 25 insertions(+), 23 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +25 -23
@@ -199,18 +199,19 @@ RECIPE_INTEL_SECTION_pn-libgpg-error = "base libs" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libgpg-error = "2 months" RECIPE_LATEST_RELEASE_DATE_pn-libgpg-error = "07/2010" RECIPE_COMMENTS_pn-libgpg-error = "" +RECIPE_MANUAL_CHECK_DATE_pn-libgpg-error = "July 28, 2011" RECIPE_LAST_UPDATE_pn-libgpg-error = "Nov 18, 2010" RECIPE_MAINTAINER_pn-libgpg-error = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-gpgme = "green" RECIPE_DEPENDENCY_CHECK_pn-gpgme = "not done" -RECIPE_LATEST_VERSION_pn-gpgme = "1.3.0" +RECIPE_LATEST_VERSION_pn-gpgme = "1.3.1" RECIPE_INTEL_SECTION_pn-gpgme = "base libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gpgme = "6 months" -RECIPE_LATEST_RELEASE_DATE_pn-gpgme = "01/2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gpgme = "5 months" +RECIPE_LATEST_RELEASE_DATE_pn-gpgme = "06/2011" RECIPE_COMMENTS_pn-gpgme = "" -RECIPE_MANUAL_CHECK_DATE_pn-gpgme = "Jun 28, 2011" -RECIPE_LAST_UPDATE_pn-gpgme = "Jul 21, 2010" +RECIPE_MANUAL_CHECK_DATE_pn-gpgme = "Jul 28, 2011" +RECIPE_LAST_UPDATE_pn-gpgme = "Jul 28, 2011" RECIPE_MAINTAINER_pn-gpgme = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-expat = "green"
@@ -299,13 +300,13 @@ RECIPE_MAINTAINER_pn-liboil = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-libassuan = "green" RECIPE_DEPENDENCY_CHECK_pn-libassuan = "not done" -RECIPE_LATEST_VERSION_pn-libassuan = "2.0.1" +RECIPE_LATEST_VERSION_pn-libassuan = "2.0.2" RECIPE_NO_OF_PATCHES_pn-libassuan = "0" RECIPE_INTEL_SECTION_pn-libassuan = "base libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libassuan = "7 months" -RECIPE_LATEST_RELEASE_DATE_pn-libassuan = "08/2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libassuan = "10 months" +RECIPE_LATEST_RELEASE_DATE_pn-libassuan = "06/2011" RECIPE_COMMENTS_pn-libassuan = "" -RECIPE_LAST_UPDATE_pn-libassuan = "Nov 19, 2010" +RECIPE_LAST_UPDATE_pn-libassuan = "Jul 28, 2011" RECIPE_MAINTAINER_pn-libassuan = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-db = "green"
@@ -1151,13 +1152,13 @@ RECIPE_LAST_UPDATE_pn-libgdbus = "Jan 4, 2011" RECIPE_MAINTAINER_pn-libgdbus = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-apr = "green" -RECIPE_LATEST_VERSION_pn-apr = "1.4.2" -RECIPE_LAST_UPDATE_pn-apr = "Dec 17, 2010" +RECIPE_LATEST_VERSION_pn-apr = "1.4.5" +RECIPE_LAST_UPDATE_pn-apr = "Jul 28, 2011" RECIPE_MAINTAINER_pn-apr = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-apr-util = "green" -RECIPE_LATEST_VERSION_pn-apr-util = "1.3.10" -RECIPE_LAST_UPDATE_pn-apr-util = "Dec 29, 2010" +RECIPE_LATEST_VERSION_pn-apr-util = "1.3.12" +RECIPE_LAST_UPDATE_pn-apr-util = "Jul 28, 2011" RECIPE_MAINTAINER_pn-apr-util = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-apt = "red"
@@ -1839,6 +1840,7 @@ RECIPE_LATEST_VERSION_pn-sed = "4.2.1" RECIPE_INTEL_SECTION_pn-sed = "base utils" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sed = "2 months" RECIPE_LATEST_RELEASE_DATE_pn-sed = "06/2009" +RECIPE_MANUAL_CHECK_DATE_pn-sed = "Jul 28, 2011" RECIPE_COMMENTS_pn-sed = "Qing maintains GPLv2 sed, while Dongxiao maintains GPLv3 sed" RECIPE_STATUS_pn-aspell = "red"
@@ -1847,8 +1849,8 @@ RECIPE_LAST_UPDATE_pn-aspell = "Aug 16, 2010" RECIPE_MAINTAINER_pn-aspell = "Mei Lei <[email protected]>" RECIPE_STATUS_pn-parted = "green" -RECIPE_LATEST_VERSION_pn-parted = "2.3" -RECIPE_LAST_UPDATE_pn-parted = "Dec 30, 2010" +RECIPE_LATEST_VERSION_pn-parted = "3.0" +RECIPE_LAST_UPDATE_pn-parted = "Jul 28, 2011" RECIPE_MAINTAINER_pn-parted = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-resolvconf = "green"
@@ -5157,13 +5159,13 @@ RECIPE_MAINTAINER_pn-libglade = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-libsoup-2.4 = "green" DISTRO_PN_ALIAS_pn-libsoup-2.4 = "Meego=libsoup Fedora=libsoup OpenSuSE=libsoup Ubuntu=libsoup2.4 Mandriva=libsoup Debian=libsoup2.4" RECIPE_DEPENDENCY_CHECK_pn-libsoup-2.4 = "not done" -RECIPE_LATEST_VERSION_pn-libsoup-2.4 = "2.32.1" +RECIPE_LATEST_VERSION_pn-libsoup-2.4 = "2.34.2" RECIPE_NO_OF_PATCHES_pn-libsoup-2.4 = "0" RECIPE_INTEL_SECTION_pn-libsoup-2.4 = "graphic UX" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsoup-2.4 = "2 month" -RECIPE_LATEST_RELEASE_DATE_pn-libsoup-2.4 = "11/2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsoup-2.4 = "1 month" +RECIPE_LATEST_RELEASE_DATE_pn-libsoup-2.4 = "08/2011" RECIPE_COMMENTS_pn-libsoup-2.4 = "" -RECIPE_LAST_UPDATE_pn-libsoup-2.4 = "Nov 19, 2010" +RECIPE_LAST_UPDATE_pn-libsoup-2.4 = "Jul 28, 2011" RECIPE_MAINTAINER_pn-libsoup-2.4 = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-libxslt = "green"
@@ -5564,14 +5566,14 @@ RECIPE_NO_UPDATE_REASON_pn-groff = "1.18.1.4 is latest GPLv2 Version no 1.21" RECIPE_STATUS_pn-eglibc = "red" RECIPE_STATUS_pn-lighttpd = "red" -RECIPE_LAST_UPDATE_pn-lighttpd = "Sep 28, 2010" +RECIPE_LAST_UPDATE_pn-lighttpd = "Jul 28, 2011" RECIPE_MAINTAINER_pn-lighttpd = "Zhai Edwin <[email protected]>" RECIPE_DEPENDENCY_CHECK_pn-lighttpd = "not done" -RECIPE_LATEST_VERSION_pn-lighttpd = "1.4.28" +RECIPE_LATEST_VERSION_pn-lighttpd = "1.4.29" RECIPE_NO_OF_PATCHES_pn-lighttpd = "0" RECIPE_INTEL_SECTION_pn-lighttpd = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lighttpd = "10 days" -RECIPE_LATEST_RELEASE_DATE_pn-lighttpd = "08/2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lighttpd = "11 month" +RECIPE_LATEST_RELEASE_DATE_pn-lighttpd = "07/2011" RECIPE_COMMENTS_pn-lighttpd = "" RECIPE_LATEST_VERSION_pn-adt-installer = "1.0"
Signature · 1 line
1.7.1
Richard Purdie
AppliedRe: [PATCH 1/2] distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade.
Quoted 6 lines · On Mon, 2011-08-15 at 20:40 +0800, [email protected] wrote:
From: Zhai Edwin <[email protected]>
Signed-off-by Zhai Edwin <[email protected]>--- .../conf/distro/include/distro_tracking_fields.inc | 48 ++++++++++--------- 1 files changed, 25 insertions(+), 23 deletions(-)
Merged to master, thanks.
Richard
PATCH 2/2 qemu: Make qemu buildable inside qemux86/qemuppc target
In reply to [email protected]From: Zhai Edwin <[email protected]>
It requires libx11 and libGL(if enabled GL) for building, which introduce extra dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus some hacks needed for building in qemupcc. For simplicity, just make qemu GL's code for native only, so that qemu building is okay in world build.
[YOCTO #1011] got fixed.
--- meta/recipes-devtools/qemu/qemu.inc | 5 ++--- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +2 -3
@@ -1,7 +1,7 @@ DESCRIPTION = "open source processor emulator" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -DEPENDS = "zlib alsa-lib qemugl" +DEPENDS = "zlib alsa-lib virtual/libx11" # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
@@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() { do_configure() { ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} - chmod a+x ${S}/target-i386/beginend_funcs.sh + test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } do_install () {
@@ -50,7 +50,6 @@ do_install () { install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu } -SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" DEPENDS_virtclass-native = "zlib-native alsa-lib-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
meta/recipes-devtools/qemu/qemu_0.14.0.bb +22 -5
@@ -11,22 +11,39 @@ FILESDIR = "${WORKDIR}" SRC_URI = "\ http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \ file://powerpc_rom.bin \ - file://qemu-git-qemugl-host.patch \ file://no-strip.patch \ - file://fix-nogl.patch \ - file://qemugl-allow-glxcontext-release.patch \ file://linker-flags.patch \ - file://init-info.patch \ file://qemu-vmware-vga-depth.patch \ - file://enable-i386-linux-user.patch \ file://fix-configure-checks.patch \ file://fallback-to-safe-mmap_min_addr.patch \ file://spice-qxl-locking-fix-for-qemu-kvm.patch \ file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ file://larger_default_ram_size.patch \ + " + +SRC_URI_append_virtclass-native = "\ + file://qemu-git-qemugl-host.patch \ + file://fix-nogl.patch \ + file://qemugl-allow-glxcontext-release.patch \ + file://init-info.patch \ + file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ " + +SRC_URI_append_virtclass-nativesdk = "\ + file://qemu-git-qemugl-host.patch \ + file://fix-nogl.patch \ + file://qemugl-allow-glxcontext-release.patch \ + file://init-info.patch \ + file://enable-i386-linux-user.patch \ + file://qemugl-fix.patch \ + file://opengl-sdl-fix.patch \ + file://glflags.patch \ + " + +#SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" + SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970" SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"
Signature · 1 line
1.7.1
Re: [PATCH 2/2] qemu: Make qemu buildable inside qemux86/qemuppc target
Quoted 83 lines · On Mon, 2011-08-15 at 20:40 +0800, [email protected] wrote:
From: Zhai Edwin <[email protected]>
It requires libx11 and libGL(if enabled GL) for building, which introduce extra dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus some hacks needed for building in qemupcc. For simplicity, just make qemu GL's code for native only, so that qemu building is okay in world build.
[YOCTO #1011] got fixed.
Signed-off-by Zhai Edwin <[email protected]>--- meta/recipes-devtools/qemu/qemu.inc | 5 ++--- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-)meta/recipes-devtools/qemu/qemu.inc +2
-3@@ -1,7 +1,7 @@ DESCRIPTION = "open source processor emulator" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -DEPENDS = "zlib alsa-lib qemugl" +DEPENDS = "zlib alsa-lib virtual/libx11" # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"@@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() { do_configure() { ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} - chmod a+x ${S}/target-i386/beginend_funcs.sh + test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } do_install () {@@ -50,7 +50,6 @@ do_install () { install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu } -SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" DEPENDS_virtclass-native = "zlib-native alsa-lib-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"meta/recipes-devtools/qemu/qemu_0.14.0.bb +14
-5@@ -11,22 +11,39 @@ FILESDIR = "${WORKDIR}" SRC_URI = "\ http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \ file://powerpc_rom.bin \ - file://qemu-git-qemugl-host.patch \ file://no-strip.patch \ - file://fix-nogl.patch \ - file://qemugl-allow-glxcontext-release.patch \ file://linker-flags.patch \ - file://init-info.patch \ file://qemu-vmware-vga-depth.patch \ - file://enable-i386-linux-user.patch \ file://fix-configure-checks.patch \ file://fallback-to-safe-mmap_min_addr.patch \ file://spice-qxl-locking-fix-for-qemu-kvm.patch \ file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ file://larger_default_ram_size.patch \ + " + +SRC_URI_append_virtclass-native = "\ + file://qemu-git-qemugl-host.patch \ + file://fix-nogl.patch \ + file://qemugl-allow-glxcontext-release.patch \ + file://init-info.patch \ + file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ " + +SRC_URI_append_virtclass-nativesdk = "\ + file://qemu-git-qemugl-host.patch \ + file://fix-nogl.patch \ + file://qemugl-allow-glxcontext-release.patch \ + file://init-info.patch \
meta/recipes-devtools/qemu/qemu_0.14.0.bb FILESDIR = "${WORKDIR}" · line 48
Quoted 10 lines
meta/recipes-devtools/qemu/qemu_0.14.0.bb +8
-0+ file://enable-i386-linux-user.patch \ + file://qemugl-fix.patch \ + file://opengl-sdl-fix.patch \ + file://glflags.patch \ + " + +#SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" + SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970" SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"
The patch is fine but could we change this to something like:
# Only use the GL passthrough patches for native/nativesdk versions
$QEMUGLPATCHES = "\
file://qemu-git-qemugl-host.patch \
file://fix-nogl.patch \
file://qemugl-allow-glxcontext-release.patch \
file://init-info.patch \
file://enable-i386-linux-user.patch \
file://qemugl-fix.patch \
file://opengl-sdl-fix.patch \
"SRC_URI_append_virtclass-native = "\
${QEMUGLPATCHES} \
"SRC_URI_append_virtclass-nativesdk = "\
${QEMUGLPATCHES} \
file://glflags.patch \
"which is just a little bit neater. Also, no need for the commented out line.
Cheers,
Richard
Re: [PATCH 2/2] qemu: Make qemu buildable inside qemux86/qemuppc target
Quoted 18 lines · Richard Purdie
The patch is fine but could we change this to something like:
# Only use the GL passthrough patches for native/nativesdk versions
$QEMUGLPATCHES = "\ file://qemu-git-qemugl-host.patch \ file://fix-nogl.patch \ file://qemugl-allow-glxcontext-release.patch \ file://init-info.patch \ file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ "SRC_URI_append_virtclass-native = "\ ${QEMUGLPATCHES} \ "
Quoted 7 lines
SRC_URI_append_virtclass-nativesdk = "\ ${QEMUGLPATCHES} \ file://glflags.patch \ "which is just a little bit neater. Also, no need for the commented out line.
RP,
Thanks for your comments. I have modified it. Pls. pull @ same branch:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2
BTW, I saw qemugl_git.bb is extended as "nativesdk", and was curious about it as qemugl is hacked libgl inside qemu guest, thus should not be related to "native" case. Any reason? Meet the dependency requirement?
Thanks,
Edwin
Quoted 13 lines
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 2 lines
best rgds, edwin
Richard Purdie
AppliedRe: [PATCH 2/2] qemu: Make qemu buildable inside qemux86/qemuppc target
Quoted 30 lines · Edwin
Quoted 18 lines · Richard Purdie
The patch is fine but could we change this to something like:
# Only use the GL passthrough patches for native/nativesdk versions
$QEMUGLPATCHES = "\ file://qemu-git-qemugl-host.patch \ file://fix-nogl.patch \ file://qemugl-allow-glxcontext-release.patch \ file://init-info.patch \ file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ "SRC_URI_append_virtclass-native = "\ ${QEMUGLPATCHES} \ "Quoted 7 lines
SRC_URI_append_virtclass-nativesdk = "\ ${QEMUGLPATCHES} \ file://glflags.patch \ "which is just a little bit neater. Also, no need for the commented out line.
RP,
Thanks for your comments. I have modified it. Pls. pull @ same branch:
Quoted 6 lines
git://git.pokylinux.org/poky-contribgzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2BTW, I saw qemugl_git.bb is extended as "nativesdk", and was curious about it as qemugl is hacked libgl inside qemu guest, thus should not be related to "native" case. Any reason? Meet the dependency requirement?
I've merged this, thanks.
We need the GL code in nativesdk since this ships as part of the SDK/ADT toolchain and we want the GL pass through support there.
Cheers,
Richard