Patchwork qemu.inc do_install question / qemu-targets.inc

login
register
mail settings
Submitter McClintock Matthew-B29882
Date Feb. 28, 2012, 9:40 p.m.
Message ID <CAEsOVNfTjTNi_nBy=Fd98JURMMLAwvcpQs=zbxihMKeRgn_ehA@mail.gmail.com>
Download mbox | patch
Permalink /patch/22377/
State New
Headers show

Comments

McClintock Matthew-B29882 - Feb. 28, 2012, 9:40 p.m.
All,

I'm wanting to remove this:


-M
Richard Purdie - March 2, 2012, 2:05 p.m.
On Tue, 2012-02-28 at 21:40 +0000, McClintock Matthew-B29882 wrote:
> All,
> 
> I'm wanting to remove this:
> 
> diff --git a/meta/recipes-devtools/qemu/qemu.inc
> b/meta/recipes-devtools/qemu/qemu.inc
> index 58049b9..3be46f2 100644
> --- a/meta/recipes-devtools/qemu/qemu.inc
> +++ b/meta/recipes-devtools/qemu/qemu.inc
> @@ -49,13 +49,6 @@ do_configure() {
>      test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x
> ${S}/target-i386/beginend_funcs.s
>  }
> 
> -do_install () {
> -       export STRIP="true"
> -       autotools_do_install
> -       install -d ${D}${datadir}/qemu
> -       install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu
> -}
> -
> 
> Can anyone comment why it's there? Can we move it up a level to a
> specific recipe? We don't want to include this powerpc_rom.bin..
> should we just fork our qemu recipe instead?

From what I remember our qemuppc image didn't boot without that file
being present. Whether that is still the case I don't know.

I care that qemuppc continues to boot correctly, not about the location
the file is installed.

> Also, can we make this change? I don't think we want ppc-linux-user on
> our ppc-softmmu target.
> 
> diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc
> b/meta/recipes-devtools/qemu/qemu-targe
> index 550a7fe..8423aa1 100644
> --- a/meta/recipes-devtools/qemu/qemu-targets.inc
> +++ b/meta/recipes-devtools/qemu/qemu-targets.inc
> @@ -6,7 +6,7 @@ def get_qemu_target_list(d):
>      import bb
>      archs = bb.data.getVar('QEMU_TARGETS', d, True).split()
>      targets = ""
> -    for arch in ['mips64', 'mips64el', 'ppcemb']:
> +    for arch in ['mips64', 'mips64el', 'ppcemb', 'ppc']:
>          if arch in archs:
>              targets += arch + "-softmmu,"
>             archs.remove(arch)

I've no hard feelings on that one.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 58049b9..3be46f2 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -49,13 +49,6 @@  do_configure() {
     test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x
${S}/target-i386/beginend_funcs.s
 }

-do_install () {
-       export STRIP="true"
-       autotools_do_install
-       install -d ${D}${datadir}/qemu
-       install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu
-}
-

Can anyone comment why it's there? Can we move it up a level to a
specific recipe? We don't want to include this powerpc_rom.bin..
should we just fork our qemu recipe instead?

Also, can we make this change? I don't think we want ppc-linux-user on
our ppc-softmmu target.

diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc
b/meta/recipes-devtools/qemu/qemu-targe
index 550a7fe..8423aa1 100644
--- a/meta/recipes-devtools/qemu/qemu-targets.inc
+++ b/meta/recipes-devtools/qemu/qemu-targets.inc
@@ -6,7 +6,7 @@  def get_qemu_target_list(d):
     import bb
     archs = bb.data.getVar('QEMU_TARGETS', d, True).split()
     targets = ""
-    for arch in ['mips64', 'mips64el', 'ppcemb']:
+    for arch in ['mips64', 'mips64el', 'ppcemb', 'ppc']:
         if arch in archs:
             targets += arch + "-softmmu,"
            archs.remove(arch)