Re: [Qemu-devel] New way of working with upstream Bochs BIOS

[Anthony Liguori]

Andre Przywara wrote:
> Anthony Liguori wrote:
> > Andre Przywara wrote:
> > > Anthony Liguori wrote:
> > > > I've setup a git mirror of Bochs on repo.or.cz.  I've also 
> > > > restructured the bios.diff into a patch queue and recorded what 
> > > > changeset we're using.  Now, to recreate the bios.bin that we ship, 
> > > > use the following instructions:
> > > Nice. But is requiring guilt (ever googled for it ;-) and poking 
> > > around in .git really necessary? I'd suggest to force all patches to 
> > > be in a (at least simulated) mbox format (as 0002-0005 are) and 
> > > using "git am" in a for loop.
> >
> > The patches are in a pretty reasonable format right now.  Normal 
> > patch with the description above.
> Sure, but not patch 0001, which lacks an author and a description. But 
> as said in the last mail, I'd question that patch anyway. Is it 
> possible to add the Makefile.in patch in this repo, or do you want 
> this to be pure BOCHS mirror?

I don't find one greater than the other so I'm reluctant to change the 
status quo.  If you really wanted to "fix" it, I'd recommend an 
--enable-qemu-bios option to the Bochs configure to enable the QEMU 
extensions.  That would be the Right Way IMHO.

> > The use of guilt is just a suggestion.  However you want to work with 
> > the patches is fine.
> Ok, then please consider this patch.

Great idea, I'll apply it.

> Regards,
> Andre
>
>
> [PATCH] Add BIOS build instructions
>
> Signed-off-by: Andre Przywara <address@hidden>
>
> --- a/pc-bios/README      (revision 6106)
> +++ b/pc-bios/README      (working copy)
> @@ -10,6 +10,27 @@
>    repo that HEAD refers to is located at
>    git://git.kernel.org/pub/scm/virt/vgabios/vgabios.git
>
> +To build these use the following instructions:
> +using guilt:
> +$ export QEMUSRC=/path/to/qemu/svn
> +$ git clone git://git.kernel.org/pub/scm/virt/bochs/bochs.git
> +$ cd bochs
> +$ git checkout -b qemu-bios $(cat $QEMUSRC/pc-bios/bios-pq/HEAD)
> +
> +$ mkdir -p .git/patches
> +$ ln -s $QEMUSRC/pc-bios/bios-pq .git/patches/qemu-bios
> +$ touch .git/patches/qemu-bios/status
> +$ guilt push -a
> +$ ./configure
> +$ cd bios
> +$ make
> +$ cp BIOS-bochs-latest $QEMUSRC/pc-bios/bios.bin
> +
> +or alternatively (after the git checkout):
> +$ for p in $(cat $QEMUSRC/pc-bios/bios-pq/series); do git am $p; done
> +$ ./configure
> +$ make bios
> +
>  - The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is
>    available at http://perso.magic.fr/l_indien/OpenHackWare/index.htm.