From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LDi4K-0001kt-NO for qemu-devel@nongnu.org; Fri, 19 Dec 2008 11:19:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LDi4K-0001kW-2R for qemu-devel@nongnu.org; Fri, 19 Dec 2008 11:19:16 -0500 Received: from [199.232.76.173] (port=47530 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LDi4J-0001kR-Sf for qemu-devel@nongnu.org; Fri, 19 Dec 2008 11:19:15 -0500 Received: from qw-out-1920.google.com ([74.125.92.144]:29564) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LDi4J-0001jp-HL for qemu-devel@nongnu.org; Fri, 19 Dec 2008 11:19:15 -0500 Received: by qw-out-1920.google.com with SMTP id 5so260858qwc.4 for ; Fri, 19 Dec 2008 08:19:14 -0800 (PST) Message-ID: <494BC97D.20101@codemonkey.ws> Date: Fri, 19 Dec 2008 10:19:09 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] New way of working with upstream Bochs BIOS References: <49497394.3010106@us.ibm.com> <494B81EE.4090800@amd.com> <494BAD65.1020007@codemonkey.ws> <494BB6EB.4010308@amd.com> In-Reply-To: <494BB6EB.4010308@amd.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andre Przywara Cc: qemu-devel@nongnu.org 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 > > --- 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. > >