Skip to contentSkip to conversation

Pull request for branch yem-host-qemu-fixes

GIT PULL New Yann E. MORIN 4 participants 12 messages Dec 13, 2012 – Dec 14, 2012

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

Hello All!

This short series is an extract from my larger qemu-related series. I did split it up to ease review and integration.

The following changes since commit e043dd6c99a801dc7f863986c78c947e25c75b3f:

barebox: bump to version 2012.12.1 (2012-12-13 09:37:10 +0100)

are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem-host-qemu-fixes

Yann E. MORIN (4):
package/qemu: fix host-qemu variable names package/qemu: fix host dependencies package/qemu: use autotools-package infrastructure package/qemu: bump version

 package/qemu/qemu.mk |   44 +++++++++++++++++++-------------------------
 1 files changed, 19 insertions(+), 25 deletions(-)

Regards,
Yann E. MORIN

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH 1/4 package/qemu: fix host-qemu variable names

With the upcoming introduction of qemu-on-target, we need to properly separate the variables used for the host qemu, from the variables used for the target qemu.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Francois Perrad <[email protected]>
---
 package/qemu/qemu.mk |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)
package/qemu/qemu.mk +14 -11
index 790d34f..81cd79f 100644
@@ -13,7 +13,10 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
 #       the non-(L)GPL license texts are specified in the affected
 #       individual source files.
 
-QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
+#-------------------------------------------------------------
+# Host-qemu
+
+HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
 
 #       BR ARCH         qemu
 #       -------         ----

@@ -44,20 +47,20 @@ QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
 #       sh64            not supported
 #       sparc           sparc
 
-QEMU_ARCH = $(ARCH)
-ifeq ($(QEMU_ARCH),i486)
-    QEMU_ARCH = i386
+HOST_QEMU_ARCH = $(ARCH)
+ifeq ($(HOST_QEMU_ARCH),i486)
+    HOST_QEMU_ARCH = i386
 endif
-ifeq ($(QEMU_ARCH),i586)
-    QEMU_ARCH = i386
+ifeq ($(HOST_QEMU_ARCH),i586)
+    HOST_QEMU_ARCH = i386
 endif
-ifeq ($(QEMU_ARCH),i686)
-    QEMU_ARCH = i386
+ifeq ($(HOST_QEMU_ARCH),i686)
+    HOST_QEMU_ARCH = i386
 endif
-ifeq ($(QEMU_ARCH),powerpc)
-    QEMU_ARCH = ppc
+ifeq ($(HOST_QEMU_ARCH),powerpc)
+    HOST_QEMU_ARCH = ppc
 endif
-HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
+HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
 
 define HOST_QEMU_CONFIGURE_CMDS
 	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH 1/4 package/qemu: fix host-qemu variable names

Quoted 6 lines · Yann E. MORIN

With the upcoming introduction of qemu-on-target, we need to properly separate the variables used for the host qemu, from the variables used for the target qemu.

Signed-off-by "Yann E. MORIN"<[email protected]>
Cc Francois Perrad<[email protected]>

Didn't I already give my

Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

?

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#3 lore raw

PATCH 1/4 package/qemu: fix host-qemu variable names

In reply to Yann E. MORIN
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> With the upcoming introduction of qemu-on-target, we need to properly Yann> separate the variables used for the host qemu, from the variables Yann> used for the target qemu.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#4 lore raw

PATCH 2/4 package/qemu: fix host dependencies

In reply to Yann E. MORIN

'host-*' packages should depends on other 'host-*' packages, not on target packages.

Reported-by Arnout Vandecappelle <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Francois Perrad <[email protected]>
---
 package/qemu/qemu.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/qemu/qemu.mk +1 -1
index 81cd79f..2c0dbde 100644
@@ -16,7 +16,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
 #-------------------------------------------------------------
 # Host-qemu
 
-HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
+HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2
 
 #       BR ARCH         qemu
 #       -------         ----
Signature · 1 line
1.7.2.5
#5 lore raw

PATCH 2/4 package/qemu: fix host dependencies

Quoted 6 lines · Yann E. MORIN

'host-*' packages should depends on other 'host-*' packages, not on target packages.

Reported-by Arnout Vandecappelle<[email protected]>
Signed-off-by "Yann E. MORIN"<[email protected]>
Cc Francois Perrad<[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#6 lore raw

PATCH 2/4 package/qemu: fix host dependencies

In reply to Yann E. MORIN
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> 'host-*' packages should depends on other 'host-*' packages, Yann> not on target packages.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 3/4 package/qemu: use autotools-package infrastructure

In reply to Yann E. MORIN

Turns out that, with a little bit of tweaking, we can use the autotools-package infrastructure to build QEMU.

That's better than defining all the _CMDS and using the generic-package infra.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Francois Perrad <[email protected]>
---
 package/qemu/qemu.mk |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)
package/qemu/qemu.mk +4 -13
index 2c0dbde..91d0eb8 100644
@@ -62,6 +62,9 @@ ifeq ($(HOST_QEMU_ARCH),powerpc)
 endif
 HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
 
+# Note: although QEMU has a ./configure script, it is not a real autotools
+# package, and ./configure chokes on options such as --host or --target.
+# So, provide out own _CONFIGURE_CMDS to override the defaults.
 define HOST_QEMU_CONFIGURE_CMDS
 	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
 		--target-list="$(HOST_QEMU_TARGETS)"    \

@@ -74,19 +77,7 @@ define HOST_QEMU_CONFIGURE_CMDS
 	)
 endef
 
-define HOST_QEMU_BUILD_CMDS
-	$(MAKE) -C $(@D) all
-endef
-
-define HOST_QEMU_INSTALL_CMDS
-	$(MAKE) -C $(@D) install
-endef
-
-define HOST_QEMU_CLEAN_CMDS
-	$(MAKE) -C $(@D) clean
-endef
-
-$(eval $(host-generic-package))
+$(eval $(host-autotools-package))
 
 # variable used by other packages
 QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)
Signature · 1 line
1.7.2.5
author
#8 lore raw

PATCH 4/4 package/qemu: bump version

In reply to Yann E. MORIN

Bump QEMU to 1.2.1.

Note: 1.3.0 is out now, but ./configure has changed a bit, and there are new dependencies, so the bump to 1.3.0 is postponed for a litle while...

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Francois Perrad <[email protected]>
---
 package/qemu/qemu.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/qemu/qemu.mk +1 -1
index 91d0eb8..241a392 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEMU_VERSION = 1.2.0
+QEMU_VERSION = 1.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
1.7.2.5
#9 lore raw

PATCH 4/4 package/qemu: bump version

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> Bump QEMU to 1.2.1.
Yann> Note: 1.3.0 is out now, but ./configure has changed a bit, and there are Yann> new dependencies, so the bump to 1.3.0 is postponed for a litle while...

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#10 lore raw

PATCH 4/4 package/qemu: bump version

In reply to Yann E. MORIN

2012/12/13 Yann E. MORIN <[email protected]>:

Quoted 5 lines

Bump QEMU to 1.2.1.

Note: 1.3.0 is out now, but ./configure has changed a bit, and there are new dependencies, so the bump to 1.3.0 is postponed for a litle while...

a version 1.2.2 is also available.
with version 1.3.0, host-qemu depends on host-pixman.

Fran?ois

Quoted 26 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Francois Perrad <[email protected]>
---
 package/qemu/qemu.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/qemu/qemu.mk +1 -2
index 91d0eb8..241a392 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-QEMU_VERSION = 1.2.0
+QEMU_VERSION = 1.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
--

1.7.2.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

author
#11 lore raw

PATCH 4/4 package/qemu: bump version

Fran?ois, All,

Quoted 8 lines · On Friday 14 December 2012 Fran?ois Perrad wrote:

2012/12/13 Yann E. MORIN <[email protected]>:

Quoted 5 lines

Bump QEMU to 1.2.1.

Note: 1.3.0 is out now, but ./configure has changed a bit, and there are new dependencies, so the bump to 1.3.0 is postponed for a litle while...

a version 1.2.2 is also available.

Ah, 1.2.2 has just been released two days ago, indeed. Thanks for the heads up.

Quoted 1 line

with version 1.3.0, host-qemu depends on host-pixman.

Yep, upgrading to 1.3.0 is on my todo-list, as it adds a few bits I'm interested in.

Upgrading to 1.3.0 now would make it more complex to review the whole series, and it is not even easy right now.

So, that will have to wait for after the current series has been upstreamed.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'