From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:52330)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1R7Rbt-0007BF-NF
	for qemu-devel@nongnu.org; Sat, 24 Sep 2011 08:45:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1R7Rbr-0005sq-PB
	for qemu-devel@nongnu.org; Sat, 24 Sep 2011 08:45:37 -0400
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <4E7DD0E0.2090209@redhat.com>
Date: Sat, 24 Sep 2011 14:45:20 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1315989802-18753-1-git-send-email-agraf@suse.de>
	<1315989802-18753-51-git-send-email-agraf@suse.de>
	<CAFEAcA9w-4R3PqNVq8hL3rLn-kC-SLpyvApCsMYCmkKmEpr2yQ@mail.gmail.com>
	<69C96688-2470-40CE-AA62-6E66AC77B8FC@suse.de>
	<CAFEAcA8K_vKPa1JV7Ab-sNiGp8RNwfk7HAud-SPq=GBFDm7H7w@mail.gmail.com>
	<4E70A530.1070006@us.ibm.com>
	<20110920034010.GJ29197@yookeroo.fritz.box>
In-Reply-To: <20110920034010.GJ29197@yookeroo.fritz.box>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 50/58] pseries: Update SLOF
	firmware image
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, qemu-devel Developers <qemu-devel@nongnu.org>, "qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>

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.

Paolo