Re: [Xen-devel] [PATCH] ipxe: update to upstream version

[Roger Pau Monnà <roger.pau@xxxxxxxxxxxxx>]

2011/12/21 Jan Beulich <JBeulich@xxxxxxxx>:
>>>> On 20.12.11 at 05:21, Roger Pau Monne <roger.pau@xxxxxxxxxxxxx> wrote:
>> --- a/tools/firmware/etherboot/Makefile    Fri Dec 09 16:19:36 2011 +0000
>> +++ b/tools/firmware/etherboot/Makefile    Tue Dec 20 05:20:02 2011 +0100
>> @@ -10,9 +10,7 @@ else
>> ÂIPXE_GIT_URL := git://git.ipxe.org/ipxe.git
>> Âendif
>>
>> -IPXE_GIT_TAG := v1.0.0
>> -
>> -IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
>> +IPXE_GIT_TREE := 540e5960dc6b49eacf367f7c319fd0546474b845
>
> Is "TREE" really a meaningful name tag here? "COMMIT" would seem
> more reasonable to me.

Well this hash is actually the tree hash, not the commit hash, see:

https://git.ipxe.org/ipxe.git/commit/9a93db3f0947484e30e753bbd61a10b17336e20e

>>
>> ÂD=ipxe
>> ÂT=ipxe.tar.gz
>> @@ -35,12 +33,10 @@ eb-roms.h: Config
>> Â Â Â mv -f $@.new $@
>>
>> Â$T:
>> - Â Â if ! wget -O _$T $(IPXE_TARBALL_URL); then \
>> - Â Â Â Â Â Â $(GIT) clone $(IPXE_GIT_URL) $D.git; \
>> - Â Â Â Â Â Â (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
>> - Â Â Â Â Â Â $(IPXE_GIT_TAG) | gzip >../_$T); \
>> - Â Â Â Â Â Â rm -rf $D.git; \
>> - Â Â fi
>> + Â Â $(GIT) clone $(IPXE_GIT_URL) $D.git; \
>> + Â Â (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
>> + Â Â $(IPXE_GIT_TREE) | gzip >../_$T); \
>> + Â Â rm -rf $D.git; \
>> Â Â Â mv _$T $T
>>
>> Â$D/src/arch/i386/Makefile: $T Config
>
> Please retain the option to have a tarball, so one can easily point
> this to some local file (and not require a functional network, nor
> having to tolerate the slowness of the cloning process, nor having
> to have git installed everywhere).

This patch retains the option to have a tarball, if it finds a
ipxe.tar.gz, nothing is downloaded.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel