From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: Re: [PATCH] tools/seabios: override $(PYTHON) Date: Wed, 22 Feb 2012 13:33:52 +0100 Message-ID: <4F44E0B0.8010007@amd.com> References: <4F33ADBD.5080502@amd.com> <1328788790.6133.148.camel@zakaz.uk.xensource.com> <4F42227D.8090801@amd.com> <1329824022.25232.103.camel@dagon.hellion.org.uk> <20291.36697.376087.225279@mariner.uk.xensource.com> <1329831808.3990.83.camel@zakaz.uk.xensource.com> <20291.46269.502471.996774@mariner.uk.xensource.com> <1329837485.3990.111.camel@zakaz.uk.xensource.com> <20291.47326.624920.309995@mariner.uk.xensource.com> <1329841075.3990.119.camel@zakaz.uk.xensource.com> <1329911626.2880.42.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1329911626.2880.42.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: "xen-devel@lists.xensource.com" , Ian Jackson List-Id: xen-devel@lists.xenproject.org On 02/22/12 12:53, Ian Campbell wrote: > On Tue, 2012-02-21 at 16:17 +0000, Ian Campbell wrote: >>> it needs to be what you would need to >>> edit to change the result of the Xen build. So either it must be >>> .._TAG >> >> I'll choose this option. I'll also edit the repo description to make it >> clear that all branches are rebasing. >> >>> or it must be some fast-forwarding branch constructed from the >>> series of _TAG values. (Ie, a branch whose commits correspond 1:1 >>> with _TAG values, each commit on the master branch having the previous >>> master commit as its left parent and the _TAG, which determines the >>> contents, as the right parent.) >> >> I think I'd inevitably end up cocking this scheme up, especially given >> the expected frequency of seabios updates (e.g. v. low). > > ... actually I don't need to pick between the two until this actually > happens. When it does happen I'll play with the second option and > determine if I am capable of not making a mess of it etc. > > For now I have cherry-picked the upstream fix onto a new branch > "1.6.3-stable-xen" and pushed that branch to our repo. I have also > updated the "xen-unstable" branch (the default branch) with the same. > > IanJ -- when you are ready to push the xen-unstable.hg side please > include an update of SEABIOS_UPSTREAM_TAG to > 002d30b5f4f48ee203be3bad9d68dc8b538ee35b (instead of rel-1.6.3.1 as it > is currently). There is still one fix missing from upstream, namely: 805ede2bd35243a4298bc64bd81be6db7cf57f58 Christoph -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85689 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632