Skip to contentSkip to conversation

QEMU: bump to 2.2.1

PATCH New Markos Chandras 2 participants 5 messages Apr 23, 2015 – Apr 27, 2015

lore
Share & tools
lore

Markos Chandras

author
#0 lore raw

PATCH 1/2 QEMU: bump to 2.2.1

Bump QEMU to 2.2.1

Signed-off-by Markos Chandras <[email protected]>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qemu/qemu.mk +1 -1
index 1202df77c5e4..b73127b24748 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QEMU_VERSION = 2.1.2
+QEMU_VERSION = 2.2.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c
Signature · 1 line
2.3.5
author
#1 lore raw

PATCH 2/2 QEMU: Enable package for MIPS targets

Allow QEMU to be installed on MIPS targets. Also introduce a new symbol (BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET) to hold the architectures than can build and use QEMU on the target.

Signed-off-by Markos Chandras <[email protected]>
---
 package/qemu/Config.in | 9 +++++++--
 package/qemu/qemu.mk   | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)
package/qemu/Config.in +7 -2
index fff786d3f11f..f537ce67181c 100644
@@ -1,11 +1,16 @@
+config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
+	bool
+	# Only tested in these architectures
+	default y if BR2_i386 || BR2_mips || BR2_mipsel || BR2_x86_64
+
 comment "QEMU requires a toolchain with wchar, threads"
-	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
 	depends on BR2_USE_MMU
 	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_QEMU
 	bool "QEMU"
-	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR # gettext
 	depends on BR2_USE_MMU # fork()
package/qemu/qemu.mk +2 -2
index b73127b24748..decfc259d2e3 100644
@@ -32,8 +32,8 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p
 #       microblaze      microblaze
 #       mips            mips
 #       mipsel          mipsel
-#       mips64          ?
-#       mips64el        ?
+#       mips64          mips64
+#       mips64el        mips64el
 #       powerpc         ppc
 #       sh2a            not supported
 #       sh4             sh4
Signature · 1 line
2.3.5
#2 lore raw

PATCH 2/2 QEMU: Enable package for MIPS targets

Dear Markos Chandras,

package/qemu/Config.in line 4

Quoted 9 lines · Markos Chandras
package/qemu/Config.in +4 -0
index fff786d3f11f..f537ce67181c 100644
@@ -1,11 +1,16 @@
+config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
+	bool
+	# Only tested in these architectures
+	default y if BR2_i386 || BR2_mips || BR2_mipsel || BR2_x86_64

So not on mips64/mips64el...

package/qemu/Config.in line 6

Quoted 4 lines
package/qemu/Config.in +2 -2
-#       mips64          ?
-#       mips64el        ?
+#       mips64          mips64
+#       mips64el        mips64el

but you update the mips64* information, which would probably indicate that it works, no?

Anyway, I've applied the patch as is, feel free to send a follow-up patch adding mips64* as well if that works.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 2/2 QEMU: Enable package for MIPS targets

Quoted 4 lines · Thomas Petazzoni

Dear Markos Chandras,

On Thu, 23 Apr 2015 10:50:57 +0100, Markos Chandras wrote:

Quoted 11 lines

package/qemu/Config.in line 4

Quoted 9 lines
package/qemu/Config.in +4 -0
index fff786d3f11f..f537ce67181c 100644
@@ -1,11 +1,16 @@
+config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
+	bool
+	# Only tested in these architectures
+	default y if BR2_i386 || BR2_mips || BR2_mipsel || BR2_x86_64

So not on mips64/mips64el...

No because it does not seem to (cross-)build for mips64.

Quoted 8 lines

package/qemu/Config.in line 6

Quoted 5 lines
package/qemu/Config.in +2 -2
-#       mips64          ?
-#       mips64el        ?
+#       mips64          mips64
+#       mips64el        mips64el

but you update the mips64* information, which would probably indicate that it works, no?

I was not sure what that list is for. I just added the missing targets there. You can still get a mips64(el) targets on a mips host though.

Quoted 3 lines

Anyway, I've applied the patch as is, feel free to send a follow-up patch adding mips64* as well if that works.

Yes we will eventually fix the build problems upstream. Thanks!

Signature · 1 line
markos
Applied
#4 lore raw

PATCH 1/2 QEMU: bump to 2.2.1

In reply to Markos Chandras

Dear Markos Chandras,

Quoted 6 lines · Markos Chandras

Bump QEMU to 2.2.1

Signed-off-by Markos Chandras <[email protected]>
---
 package/qemu/qemu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com