tools/seabios: override $(PYTHON)
PATCH 1/1 tools/seabios: override $(PYTHON)
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.
Signature · 6 lines
---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
tools/firmware/Makefile +1 -1
@@ -25,7 +25,7 @@ all: seabios-dir echo "==========================================================================="; \ false ; \ fi - $(MAKE) subdirs-$@; \ + $(MAKE) PYTHON=$(PYTHON) subdirs-$@; \ .PHONY: install
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 6 lines · Christoph Egger
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.Signed-off-by Christoph Egger <[email protected]>
Quoted 10 lines · Ian Campbell
Quoted 6 lines · Christoph Egger
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.Signed-off-by Christoph Egger<[email protected]>Acked-by Ian Campbell<[email protected]>
Please apply this patch and update SeaBIOS. Keven O'Connors patches went upstream on Feb 8th.
Christoph
Signature · 6 lines
---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
Ian Campbell writes ("Re: [Xen-devel] [PATCH] tools/seabios: override $(PYTHON)"):
Quoted 7 lines · Christoph Egger
Quoted 6 lines
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.Signed-off-by Christoph Egger <[email protected]>
Thanks for this. I'm going to hold off on this though for the moment in case it conflicts with Roger's autoconf patch. Also I'm afraid it needs a refresh anyway.
Thanks,
Ian.
Quoted 7 lines · Christoph Egger
Quoted 6 lines · Ian Campbell
Quoted 5 lines · Christoph Egger
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Christoph Egger<[email protected]>Acked-by Ian Campbell<[email protected]>Please apply this patch and update SeaBIOS.
Keven O'Connors patches went upstream on Feb 8th.
I was hoping to track SeaBIOS stable branches so I am reluctant to simply update to a random commit on the development branch.
Currently we are tracking the upstream 1.6.3-stable branch in the xen-unstable branch of our seabios.git. In hindsight this might have been an error since it means that our branch will only be non-rebasing until we switch to 1.6.4 or 1.7.0 (whichever comes next).
I'm not sure how best to approach this, obviously I could create a 1.6.3-stable-xen branch and backport your fix to it. I'd like to decide what approach I should take when the upstream latest-stable branch changes first though.
My immediate thought is that I should remove the "xen-unstable" branch from our tree and instead push upstream's 1.6.3-stable branch and then push my 1.6.3-stable-xen branch and switch to that. When new stable branch X.Y.Z-stable happens upstream I will simply create a new X.Y.Z-stable-xen based on it.
However I am not sure what to do with the "master" branch of our tree. Previously I just omitted it since it has no real meaning but that caused confusion and people wanted me to put something there.
I don't want to track the upstream devel branch since I don't want users who clone our tree to think we support that as is. I don't want to push the currently supported stable branch because that would necessarily make master a rebasing branch.
The xen-unstable build system itself uses explicit commit numbers or tags so isn't really effected.
IanJ -- what do you think?
Ian.
Ian Campbell writes ("Re: [Xen-devel] [PATCH] tools/seabios: override $(PYTHON)"):
Quoted 9 lines
However I am not sure what to do with the "master" branch of our tree. Previously I just omitted it since it has no real meaning but that caused confusion and people wanted me to put something there.
I don't want to track the upstream devel branch since I don't want users who clone our tree to think we support that as is. I don't want to push the currently supported stable branch because that would necessarily make master a rebasing branch.
Quoted 4 lines
The xen-unstable build system itself uses explicit commit numbers or tags so isn't really effected.
IanJ -- what do you think?
Why not make "master" be equal to the SEABIOS_UPSTREAM_TAG in xen-unstable's Config.mk ? That's what I do with qemu-xen-unstable.git.
Ian.
Quoted 24 lines · Ian Campbell
Quoted 7 lines · Christoph Egger
Quoted 6 lines · Ian Campbell
Quoted 5 lines · Christoph Egger
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Christoph Egger<[email protected]>Acked-by Ian Campbell<[email protected]>Please apply this patch and update SeaBIOS.
Keven O'Connors patches went upstream on Feb 8th.I was hoping to track SeaBIOS stable branches so I am reluctant to simply update to a random commit on the development branch.
Currently we are tracking the upstream 1.6.3-stable branch in the xen-unstable branch of our seabios.git. In hindsight this might have been an error since it means that our branch will only be non-rebasing until we switch to 1.6.4 or 1.7.0 (whichever comes next).
Quoted 4 lines
I'm not sure how best to approach this, obviously I could create a 1.6.3-stable-xen branch and backport your fix to it. I'd like to decide what approach I should take when the upstream latest-stable branch changes first though.
Have you tried to ask Kevin to backport the commit to stable?
Quoted 10 lines · Ian Jackson
Ian Campbell writes ("Re: [Xen-devel] [PATCH]
tools/seabios: override $(PYTHON)"):Quoted 9 lines
However I am not sure what to do with the "master" branch of our tree. Previously I just omitted it since it has no real meaning but that caused confusion and people wanted me to put something there.
I don't want to track the upstream devel branch since I don't want users who clone our tree to think we support that as is. I don't want to push the currently supported stable branch because that would necessarily make master a rebasing branch.
Quoted 8 lines
Quoted 4 lines
The xen-unstable build system itself uses explicit commit numbers or tags so isn't really effected.
IanJ -- what do you think?
Why not make "master" be equal to the
SEABIOS_UPSTREAM_TAGin xen-unstable's Config.mk ? That's what I do with qemu-xen-unstable.git.
That would make master rebasing. I'm happy to do that if there is consensus that it is ok.
Ian.
Quoted 25 lines · Stefano Stabellini
Quoted 24 lines · Ian Campbell
Quoted 7 lines · Christoph Egger
Quoted 6 lines · Ian Campbell
Quoted 5 lines · Christoph Egger
Pass PYTHON=$(PYTHON) to gmake when building seabios. This fixes seabios build error
'python not found'
along with the patches from Kevin O'Connor.Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Christoph Egger<[email protected]>Acked-by Ian Campbell<[email protected]>Please apply this patch and update SeaBIOS.
Keven O'Connors patches went upstream on Feb 8th.I was hoping to track SeaBIOS stable branches so I am reluctant to simply update to a random commit on the development branch.
Currently we are tracking the upstream 1.6.3-stable branch in the xen-unstable branch of our seabios.git. In hindsight this might have been an error since it means that our branch will only be non-rebasing until we switch to 1.6.4 or 1.7.0 (whichever comes next).
Quoted 6 lines
Quoted 4 lines
I'm not sure how best to approach this, obviously I could create a 1.6.3-stable-xen branch and backport your fix to it. I'd like to decide what approach I should take when the upstream latest-stable branch changes first though.
Have you tried to ask Kevin to backport the commit to stable?
Not yet, I was more interested in the general problem than this specific commit right at the moment.
Ian.
Ian Campbell writes ("Re: [Xen-devel] [PATCH] tools/seabios: override $(PYTHON)"):
Quoted 7 lines · Ian Jackson
Quoted 3 lines
Why not make "master" be equal to the
SEABIOS_UPSTREAM_TAGin xen-unstable's Config.mk ? That's what I do with qemu-xen-unstable.git.That would make master rebasing. I'm happy to do that if there is consensus that it is ok.
Wait, you're rewinding SEABIOS_UPSTREAM_TAG ? That's quite exciting.
Ian.
Quoted 10 lines · Ian Jackson
Ian Campbell writes ("Re: [Xen-devel] [PATCH]
tools/seabios: override $(PYTHON)"):Quoted 7 lines · Ian Jackson
Quoted 3 lines
Why not make "master" be equal to the
SEABIOS_UPSTREAM_TAGin xen-unstable's Config.mk ? That's what I do with qemu-xen-unstable.git.That would make master rebasing. I'm happy to do that if there is consensus that it is ok.
Wait, you're rewinding
SEABIOS_UPSTREAM_TAG? That's quite exciting.
SEABIOS_UPSTREAM_TAG is tracking an upstream stable branch. When they release a new stable release we will want to switch to that, but that will not be a fast-forward.
Ian.
Ian Campbell writes ("Re: [Xen-devel] [PATCH] tools/seabios: override $(PYTHON)"):
Quoted 7 lines · Ian Jackson
Quoted 6 lines
Ian Campbell writes ("Re: [Xen-devel] [PATCH]
tools/seabios: override $(PYTHON)"):Quoted 5 lines · Ian Jackson
Quoted 3 lines
Why not make "master" be equal to the
SEABIOS_UPSTREAM_TAGin xen-unstable's Config.mk ? That's what I do with qemu-xen-unstable.git.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
That would make master rebasing. I'm happy to do that if there is consensus that it is ok.
Wait, you're rewinding
SEABIOS_UPSTREAM_TAG? That's quite exciting.
SEABIOS_UPSTREAM_TAGis tracking an upstream stable branch. When they release a new stable release we will want to switch to that, but that will not be a fast-forward.
Hmm. Well as to the question of what "master" should be:
If it's anything useful at all, it needs to be what you would need to edit to change the result of the Xen build. So either it must be .._TAG 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.)
Ian.
Quoted 13 lines · Ian Jackson
Ian Campbell writes ("Re: [Xen-devel] [PATCH]
tools/seabios: override $(PYTHON)"):Quoted 12 lines · Ian Jackson
Quoted 10 lines
Ian Campbell writes ("Re: [Xen-devel] [PATCH]
tools/seabios: override $(PYTHON)"):Quoted 7 lines · Ian Jackson
Quoted 3 lines
Why not make "master" be equal to the
SEABIOS_UPSTREAM_TAGin xen-unstable's Config.mk ? That's what I do with qemu-xen-unstable.git.That would make master rebasing. I'm happy to do that if there is consensus that it is ok.
Wait, you're rewinding
SEABIOS_UPSTREAM_TAG? That's quite exciting.
Quoted 7 lines
Quoted 3 lines
SEABIOS_UPSTREAM_TAGis tracking an upstream stable branch. When they release a new stable release we will want to switch to that, but that will not be a fast-forward.Hmm. Well as to the question of what "master" should be:
If it's anything useful at all,
(which I'm not personally convinced of, but I seem to be in the minority so I shall try and make it mean something)
Quoted 3 lines
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.
Quoted 5 lines
or it must be some fast-forwarding branch constructed from the
series of_TAGvalues. (Ie, a branch whose commits correspond 1:1 with_TAGvalues, 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).
Ian.
Quoted 7 lines · Ian Campbell
Quoted 3 lines
it needs to be what you would need to
edit to change the result of the Xen build. So either it must be .._TAGI'll choose this option. I'll also edit the repo description to make it clear that all branches are rebasing.
Quoted 8 lines
Quoted 5 lines
or it must be some fast-forwarding branch constructed from the
series of_TAGvalues. (Ie, a branch whose commits correspond 1:1 with_TAGvalues, 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).
Ian.
Ian Campbell writes ("Re: [Xen-devel] [PATCH] tools/seabios: override $(PYTHON)"):
Quoted 4 lines
IanJ -- when you are ready to push the xen-unstable.hg side please include an update of
SEABIOS_UPSTREAM_TAGto002d30b5f4f48ee203be3bad9d68dc8b538ee35b(instead of rel-1.6.3.1 as it is currently).
I think each side of this change is harmless independently, so you can go ahead and do that whenever you think it right. But perhaps we should wait with this and the $(PYTHON)-passing patch until we get the tree building again.
Ian.
Quoted 10 lines · Ian Jackson
Ian Campbell writes ("Re: [Xen-devel] [PATCH]
tools/seabios: override $(PYTHON)"):Quoted 4 lines
IanJ -- when you are ready to push the xen-unstable.hg side please include an update of
SEABIOS_UPSTREAM_TAGto002d30b5f4f48ee203be3bad9d68dc8b538ee35b(instead of rel-1.6.3.1 as it is currently).I think each side of this change is harmless independently, so you can go ahead and do that whenever you think it right. But perhaps we should wait with this and the $(PYTHON)-passing patch until we get the tree building again.
Ack on waiting.
Ian.
Quoted 21 lines · Ian Campbell
Quoted 7 lines · Ian Campbell
Quoted 3 lines
it needs to be what you would need to
edit to change the result of the Xen build. So either it must be .._TAGI'll choose this option. I'll also edit the repo description to make it clear that all branches are rebasing.
Quoted 8 lines
Quoted 5 lines
or it must be some fast-forwarding branch constructed from the
series of_TAGvalues. (Ie, a branch whose commits correspond 1:1 with_TAGvalues, 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.
Quoted 8 lines
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_TAGto002d30b5f4f48ee203be3bad9d68dc8b538ee35b(instead of rel-1.6.3.1 as it is currently).
There is still one fix missing from upstream, namely: 805ede2bd35243a4298bc64bd81be6db7cf57f58
Christoph
Signature · 6 lines
---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
Ian Campbell
AppliedQuoted 8 lines · Christoph Egger
Quoted 4 lines · Ian Campbell
IanJ -- when you are ready to push the xen-unstable.hg side please include an update of
SEABIOS_UPSTREAM_TAGto002d30b5f4f48ee203be3bad9d68dc8b538ee35b(instead of rel-1.6.3.1 as it is currently).There is still one fix missing from upstream, namely:
805ede2bd35243a4298bc64bd81be6db7cf57f58
I've applied this one as well and updated SEABIOS_UPSTREAM_TAG to pull in both.
Thanks,
Ian.