All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joshua Lock <joshua.g.lock@linux.intel.com>
To: California Sullivan <california.l.sullivan@intel.com>,
	 openembedded-core@lists.openembedded.org
Subject: Re: [PATCH RFC] scripts/runqemu: Be more loose when guessing QB_SYSTEM_NAME variable
Date: Tue, 27 Sep 2016 19:59:43 +0100	[thread overview]
Message-ID: <1475002783.3072.13.camel@linux.intel.com> (raw)
In-Reply-To: <1475000836-12716-1-git-send-email-california.l.sullivan@intel.com>

On Tue, 2016-09-27 at 11:27 -0700, California Sullivan wrote:
> Following the instructions to reproduce YOCTO #10026 I found that
> runqemu would fail to start because QB_SYSTEM_NAME is null. This
> patch
> makes the guessing algorithm more loose allowing it to correctly
> guess
> the variable from the MACHINE name.

Out of interest can you help me understand how/when the current code
fails?

> 
> It is still a good assumption that if it contains "qemux86-64" for
> example, that the system is x86-64, so this is unlikely to cause any
> new issues while preserving some peoples' old workflows.
> 
> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
> ---
>  scripts/runqemu | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 45bcad7..b06d09e 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -870,20 +870,20 @@ class BaseConfig(object):
>          if not mach:
>              return None
>  
> -        if mach == 'qemuarm':
> -            qbsys = 'arm'
> -        elif mach == 'qemuarm64':
> +        elif 'qemuarm64' in mach:

This elif should be below the "if 'qemuarm' in mach" below which begins
the control flow statements for determining the value to assign to the
qbsys variable.

>              qbsys = 'aarch64'
> -        elif mach == 'qemux86':
> -            qbsys = 'i386'
> -        elif mach == 'qemux86-64':
> +        if 'qemuarm' in mach:
> +            qbsys = 'arm'
> +        elif 'qemux86-64' in mach:
>              qbsys = 'x86_64'
> -        elif mach == 'qemuppc':
> +        elif 'qemux86' in mach:
> +            qbsys = 'i386'
> +        elif 'qemuppc' in mach:
>              qbsys = 'ppc'
> -        elif mach == 'qemumips':
> -            qbsys = 'mips'
> -        elif mach == 'qemumips64':
> +        elif 'qemumips64' in mach:
>              qbsys = 'mips64'
> +        elif 'qemumips' in mach:
> +            qbsys = 'mips'
>  
>          return 'qemu-system-%s' % qbsys
>  
> -- 
> 2.5.5
> 


  reply	other threads:[~2016-09-27 18:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-27 18:27 [PATCH RFC] scripts/runqemu: Be more loose when guessing QB_SYSTEM_NAME variable California Sullivan
2016-09-27 18:59 ` Joshua Lock [this message]
2016-09-27 19:51   ` Cal Sullivan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1475002783.3072.13.camel@linux.intel.com \
    --to=joshua.g.lock@linux.intel.com \
    --cc=california.l.sullivan@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.