From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LD4Fb-0000G7-5W for qemu-devel@nongnu.org; Wed, 17 Dec 2008 16:48:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LD4FZ-0000D1-Uu for qemu-devel@nongnu.org; Wed, 17 Dec 2008 16:48:14 -0500 Received: from [199.232.76.173] (port=45700 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LD4FZ-0000CX-Do for qemu-devel@nongnu.org; Wed, 17 Dec 2008 16:48:13 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:36042) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LD4FY-0001bP-Uz for qemu-devel@nongnu.org; Wed, 17 Dec 2008 16:48:13 -0500 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e32.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id mBHLkYtQ017759 for ; Wed, 17 Dec 2008 14:46:34 -0700 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mBHLm7F7169922 for ; Wed, 17 Dec 2008 14:48:07 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id mBHLm7ln025032 for ; Wed, 17 Dec 2008 14:48:07 -0700 Received: from [10.0.5.1] (sig-9-65-4-70.mts.ibm.com [9.65.4.70]) by d03av01.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id mBHLm6ps024892 for ; Wed, 17 Dec 2008 14:48:07 -0700 Message-ID: <49497394.3010106@us.ibm.com> Date: Wed, 17 Dec 2008 15:48:04 -0600 From: Anthony Liguori MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] New way of working with upstream Bochs BIOS Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "qemu-devel@nongnu.org" 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: $ export QEMUSRC=/path/to/qemu/svn $ git clone git://repo.or.cz/bochs-mirror.git $ cd bochs-mirror $ 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 New patches against bochs should go in pc-bios/bios-pq with series being updated appropriately. When we bump to a new version of the bochs bios, we should update pc-bios/HEAD appropriately. The bochs mirror gets updated daily with a cron job for now. Regards, Anthony Liguori