On Sat, Sep 24, 2011 at 02:45:20PM +0200, Paolo Bonzini wrote:
> On 09/20/2011 05:40 AM, David Gibson wrote:
> >Ah, yes, here's the point. Updating git.qemu.org is not within my
> >power, so I can't myself construct a commit doing a submodule + binary
> >update in this fashion.
>
> Sure you can. A submodule checkout is just like any other git
> commit. A commit doing a submodule update is just saying "from now
> on, submodule roms/SLOF is attached to commit 12ab34cd".
>
> First of all, you should configure your qemu tree so that it uses
> your official upstream repository instead of git.qemu.org's SLOF
> mirror:
>
> git config submodule.roms/SLOF.url git://github.com/dgibson/SLOF.git
> rm -rf roms/SLOF
> git submodule update roms/SLOF
>
> Producing a valid patch is as simple as this:
>
> cd roms/SLOF
> git fetch origin # if needed
> git checkout origin/master
> cd ..
> cp /path/to/SLOF.bin pc-bios/
> git commit pc-bios roms -m'pseries: Update SLOF firmware image'
>
> Then, whoever updates git.qemu.org indeed has to pull manually from
> https://github.com/dgibson/SLOF to ensure that git.qemu.org's SLOF
> mirror does include the new commit. But that doesn't prevent you
> from *submitting* the patch.
>
> BTW, the above configuration steps should probably be done by
> everybody who's working with the pseries machine, so that they will
> have easy access to upstream SLOF bugfixes.
Thanks for the recipe.
Alex, do you want me to submit a replacement SLOF update patch which
does this, or will you fix up the existing one in your ppc queue?
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
