Patchwork [02/51] package/qemu: fix host-qemu variable names

login
register
mail settings
Submitter Yann E. MORIN
Date Dec. 9, 2012, 4:34 p.m.
Message ID <1355070924-8009-3-git-send-email-yann.morin.1998@free.fr>
Download mbox | patch
Permalink /patch/204704/
State Superseded
Headers show

Comments

Yann E. MORIN - Dec. 9, 2012, 4:34 p.m.
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>
---
 package/qemu/qemu.mk |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)
Arnout Vandecappelle - Dec. 10, 2012, 6:37 a.m.
On 09/12/12 17:34, Yann E. MORIN wrote:
> 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>
> ---
>   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

  I guess this should be host-zlib and host-libglib2?

  Regards,
  Arnout
Yann E. MORIN - Dec. 10, 2012, 8:11 a.m.
Arnout, All,

On Monday 10 December 2012 07:37:48 Arnout Vandecappelle wrote:
> On 09/12/12 17:34, Yann E. MORIN wrote:
> > 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>
> > ---
> >   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
> 
>   I guess this should be host-zlib and host-libglib2?

I think so, too, but I just renamed the variable, I did not change the
content.

I postponed testing this host-qemu for now.

Regards,
Yann E. MORIN.

Patch

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   \