[Buildroot] [git commit] package/qemu: fix host-qemu variable names

[Buildroot] [git commit] package/qemu: fix host-qemu variable names

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=6f7884c81461bdb35ff47da9cd84c8a8ca5d57cb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/qemu/qemu.mk |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 790d34f..81cd79f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -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   \

[Buildroot] [git commit] package/qemu: fix host-qemu variable names

[François Perrad]

2012/12/14 Peter Korsgaard <jacmet@sunsite.dk>:
> commit: http://git.buildroot.net/buildroot/commit/?id=6f7884c81461bdb35ff47da9cd84c8a8ca5d57cb
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> 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.
>

you've missed the last line of qemu.mk :
 # variable used by other packages
-QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)
+QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)

Fran?ois

> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Francois Perrad <fperrad@gmail.com>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
> ---
>  package/qemu/qemu.mk |   25 ++++++++++++++-----------
>  1 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> index 790d34f..81cd79f 100644
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -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   \
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [git commit] package/qemu: fix host-qemu variable names

[Peter Korsgaard]

>>>>> "Fran?ois" == Fran?ois Perrad <francois.perrad@gadz.org> writes:

 Fran?ois> 2012/12/14 Peter Korsgaard <jacmet@sunsite.dk>:
 >> commit: http://git.buildroot.net/buildroot/commit/?id=6f7884c81461bdb35ff47da9cd84c8a8ca5d57cb
 >> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
 >> 
 >> 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.
 >> 

 Fran?ois> you've missed the last line of qemu.mk :
 Fran?ois>  # variable used by other packages
 Fran?ois> -QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)
 Fran?ois> +QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)

Ahh yes, I'll fix that - Thanks.

-- 
Bye, Peter Korsgaard