# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1279638590 -3600
# Node ID ad5b6399aa29dbb35afe96ad9dc45a8f4d3f65b5
# Parent 6bebaf40e9250020c4747b541b190bdc78f1eff0
hvmloader/gpxe: Add a couple of bug-fix patches from upstream gpxe
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/firmware/etherboot/patches/gpxe-git-0edf2405b457 | 27 ++++
tools/firmware/etherboot/patches/gpxe-git-a803ef3dfeac | 105 +++++++++++++++++
tools/firmware/etherboot/patches/series | 2
3 files changed, 134 insertions(+)
diff -r 6bebaf40e925 -r ad5b6399aa29
tools/firmware/etherboot/patches/gpxe-git-0edf2405b457
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/firmware/etherboot/patches/gpxe-git-0edf2405b457 Tue Jul 20
16:09:50 2010 +0100
@@ -0,0 +1,30 @@
+commit 0edf2405b457e542c244a72285511b3ff5c06885
+Author: Michael Brown <mcb30@xxxxxxxx>
+Date: Tue Apr 27 09:52:22 2010 +0100
+
+ [build] Fix building with binutils 2.16
+
+ Signed-off-by: Michael Brown <mcb30@xxxxxxxx>
+ Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxx>
+
+diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/i386/scripts/i386.lds
+index 278a397..0ce2c10 100644
+--- a/src/arch/i386/scripts/i386.lds
++++ b/src/arch/i386/scripts/i386.lds
+@@ -24,6 +24,8 @@ SECTIONS {
+ *
+ */
+
++ PROVIDE ( _max_align = 16 );
++
+ /*
+ * The prefix
+ *
+@@ -169,7 +171,6 @@ SECTIONS {
+ *
+ */
+
+- PROVIDE ( _max_align = 16 );
+ . = 0;
+
+ . = ALIGN ( _max_align );
diff -r 6bebaf40e925 -r ad5b6399aa29
tools/firmware/etherboot/patches/gpxe-git-a803ef3dfeac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/firmware/etherboot/patches/gpxe-git-a803ef3dfeac Tue Jul 20
16:09:50 2010 +0100
@@ -0,0 +1,125 @@
+commit a803ef3dfeac4e8aa35810bba65f9ccab0bdf264
+Author: Michael Brown <mcb30@xxxxxxxx>
+Date: Thu Jun 24 01:23:00 2010 +0100
+
+ [build] Avoid hard-coding the path to perl
+
+ The path "/usr/bin/perl" has been hard-coded since Etherboot 5.1, for
+ no discernible reason. Use just "perl" instead to fix the
+ inconsistency and allow building on systems with Perl installed
+ outside of /usr/bin.
+
+ This commit also includes a later fix that removes a dependency on
+ "perl" which broke builds from fully clean trees.
+
+ Reported-by: Gabor Z. Papp <gzp@xxxxxxx>
+ Signed-off-by: Michael Brown <mcb30@xxxxxxxx>
+ Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxx>
+
+diff -pruN a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios
+--- a/src/arch/i386/Makefile.pcbios 2010-06-29 20:31:33.000000000 +0100
++++ b/src/arch/i386/Makefile.pcbios 2010-07-20 16:07:06.000000000 +0100
+@@ -24,11 +24,11 @@ MEDIA += raw
+
+ # Padding rules
+ #
+-PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@
++PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
+ PAD_hrom = $(PAD_rom)
+ PAD_xrom = $(PAD_rom)
+-PAD_dsk = $(PADIMG) --blksize=512 $@
+-PAD_hd = $(PADIMG) --blksize=32768 $@
++PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@
++PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@
+
+ # rule to make a non-emulation ISO boot image
+ NON_AUTO_MEDIA += iso
+@@ -67,4 +67,4 @@ NON_AUTO_MEDIA += usb
+ NON_AUTO_MEDIA += pdsk
+ %pdsk : %dsk
+ $(Q)cp $< $@
+- $(Q)$(PADIMG) --blksize=1474560 $@
++ $(Q)$(PERL) $(PADIMG) --blksize=1474560 $@
+diff -pruN a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2010-06-29 20:31:33.000000000 +0100
++++ b/src/Makefile 2010-07-20 16:02:56.000000000 +0100
+@@ -20,7 +20,7 @@ MKDIR := mkdir
+ CP := cp
+ ECHO := echo
+ PRINTF := printf
+-PERL := /usr/bin/perl
++PERL := perl
+ CC := $(CROSS_COMPILE)gcc
+ CPP := $(CC) -E
+ AS := $(CROSS_COMPILE)as
+@@ -31,12 +31,12 @@ RANLIB := $(CROSS_COMPILE)ranlib
+ OBJCOPY := $(CROSS_COMPILE)objcopy
+ NM := $(CROSS_COMPILE)nm
+ OBJDUMP := $(CROSS_COMPILE)objdump
+-PARSEROM := $(PERL) ./util/parserom.pl
+-MAKEROM := $(PERL) ./util/makerom.pl
+-SYMCHECK := $(PERL) ./util/symcheck.pl
+-SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl
+-PADIMG := $(PERL) ./util/padimg.pl
+-LICENCE := $(PERL) ./util/licence.pl
++PARSEROM := ./util/parserom.pl
++MAKEROM := ./util/makerom.pl
++SYMCHECK := ./util/symcheck.pl
++SORTOBJDUMP := ./util/sortobjdump.pl
++PADIMG := ./util/padimg.pl
++LICENCE := ./util/licence.pl
+ NRV2B := ./util/nrv2b
+ ZBIN := ./util/zbin
+ ELF2EFI32 := ./util/elf2efi32
+diff -pruN a/src/Makefile.housekeeping b/src/Makefile.housekeeping
+--- a/src/Makefile.housekeeping 2010-06-29 20:31:33.000000000 +0100
++++ b/src/Makefile.housekeeping 2010-07-20 16:04:42.000000000 +0100
+@@ -486,7 +486,7 @@ define src_template
+ '\n$(2) : $$($(4)_DEPS)\n' \
+ '\nTAGS : $$($(4)_DEPS)\n' \
+ >> $(2)
+- @$(PARSEROM) $(1) >> $(2)
++ @$(PERL) $(PARSEROM) $(1) >> $(2)
+
+ endef
+
+@@ -695,7 +695,7 @@ $(BIN)/%.tmp : $(BLIB) $(MAKEDEPS) $(LDS
+ $(QM)$(ECHO) " [LD] $@"
+ $(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
+ -Map $(BIN)/$*.tmp.map
+- $(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
++ $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
+
+ # Keep intermediate object file (useful for debugging)
+ .PRECIOUS : $(BIN)/%.tmp
+@@ -752,7 +752,7 @@ $(BIN)/%.licence : $(BIN)/%.tmp
+ echo "files are missing a licence declaration:" ;\
+ echo $(call unlicensed_deps_list,$<);\
+ exit 1,\
+- $(LICENCE) $(call licence_list,$<))
++ $(PERL) $(LICENCE) $(call licence_list,$<))
+
+ # Extract compression information from intermediate object file
+ #
+@@ -866,10 +866,10 @@ endif # defined(BIN)
+ # the automatic build system and varies by target; it includes the
+ # "-p 0x1234,0x5678" string to set the PCI IDs.
+ #
+-FINALISE_rom = $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
++FINALISE_rom = $(PERL) $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
+ -i$(IDENT) -s 0 $@
+ FINALISE_hrom = $(FINALISE_rom)
+-FINALISE_xrom = $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
++FINALISE_xrom = $(PERL) $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
+ -i$(IDENT) -n -s 0 $@
+
+ # Some ROMs require specific flags to be passed to makerom.pl
+@@ -987,7 +987,7 @@ $(SYMTAB) : $(BLIB)
+ CLEANUP += $(BIN)/symtab
+
+ symcheck : $(SYMTAB)
+- $(SYMCHECK) $<
++ $(PERL) $(SYMCHECK) $<
+
+ endif # defined(BIN)
+
diff -r 6bebaf40e925 -r ad5b6399aa29 tools/firmware/etherboot/patches/series
--- a/tools/firmware/etherboot/patches/series Tue Jul 20 13:42:17 2010 +0100
+++ b/tools/firmware/etherboot/patches/series Tue Jul 20 16:09:50 2010 +0100
@@ -1,1 +1,3 @@ boot_prompt_option.patch
boot_prompt_option.patch
+gpxe-git-0edf2405b457
+gpxe-git-a803ef3dfeac
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home