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

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

2012/1/5 Ian Campbell <Ian.Campbell@xxxxxxxxxx>:
> On Thu, 2012-01-05 at 14:39 +0000, Ian Jackson wrote:
>> > ipxe: update to upstream version
>>
>> Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
>
> I'm guessing this is the cause of:
>
> make[6]: Entering directory 
> `/local/scratch/ianc/devel/xen-unstable.hg/tools/firmware/etherboot'
> rm -rf ipxe
> gzip -dc ipxe.tar.gz | tar xf -
> for i in $(cat patches/series) ; do         \
> Â Â Â Â Â Âpatch -d ipxe -p1 --quiet <patches/$i || exit 1 ; \
> Â Â Â Âdone
> 1 out of 4 hunks FAILED -- saving rejects to file 
> src/arch/i386/prefix/romprefix.S.rej
> make[6]: *** [ipxe/src/arch/i386/Makefile] Error 1
> make[6]: Leaving directory 
> `/local/scratch/ianc/devel/xen-unstable.hg/tools/firmware/etherboot'
>
> This seems to be fixed (or at least mitigated) by properly removing the
> tarball on clean:

Sorry, I did this patch on a fresh checkout, so I didn't realize of
this problem, the Makefile will always try to use ipxe.tar.gz if
there's one on the folder. Thanks for the patch!

> 8<---------------------------------------
>
> # HG changeset patch
> # User Ian Campbell <ian.campbell@xxxxxxxxxx>
> # Date 1325783856 0
> # Node ID 0fcfd62166de11687ac2db799b71906e7ce41300
> # Parent Âf2682e2ec7e53683a31e940ada37726aa8da7fcc
> ipxe: remove tarball on clean
>
> This prevents us picking up a stale tarball when the tag changes.
>
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
>
> diff -r f2682e2ec7e5 -r 0fcfd62166de tools/firmware/etherboot/Makefile
> --- a/tools/firmware/etherboot/Makefile Thu Jan 05 16:33:25 2012 +0000
> +++ b/tools/firmware/etherboot/Makefile Thu Jan 05 17:17:36 2012 +0000
> @@ -56,7 +56,7 @@ eb-roms.h: Config
>
> Â.PHONY: clean
> Âclean:
> - Â Â Â rm -rf $D $D.git *~ eb-roms.h _$T
> + Â Â Â rm -rf $D $D.git *~ eb-roms.h _$T $T
>
> Â.PHONY: distclean
> Âdistclean: clean
>
>
> Ian.
>
>

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