From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LDgoz-00019Z-5u
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 09:59:21 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LDgoy-00018M-Dd
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 09:59:20 -0500
Received: from [199.232.76.173] (port=38208 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LDgoy-000188-9M
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 09:59:20 -0500
Received: from outbound-va3.frontbridge.com ([216.32.180.16]:44653
	helo=VA3EHSOBE004.bigfish.com)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16)
	(Exim 4.60) (envelope-from <Andre.Przywara@amd.com>)
	id 1LDgox-0000xY-RV
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 09:59:20 -0500
Message-ID: <494BB6EB.4010308@amd.com>
Date: Fri, 19 Dec 2008 15:59:55 +0100
From: Andre Przywara <andre.przywara@amd.com>
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>
In-Reply-To: <494BAD65.1020007@codemonkey.ws>
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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: qemu-devel@nongnu.org

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?

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

Regards,
Andre


[PATCH] Add BIOS build instructions

Signed-off-by: Andre Przywara <andre.przywara@amd.com>

--- 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.