From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 10 Apr 2008 17:41:32 +0000 (-0700)
Subject: Merge commit 'syslinux-3.63' into gpxe-added
X-Git-Tag: syslinux-3.70-pre9^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6699cb66d4456f2d61b3ac3f8d14ce81df2437eb;p=profile%2Fivi%2Fsyslinux.git

Merge commit 'syslinux-3.63' into gpxe-added

Conflicts:

	NEWS
	com32/modules/Makefile
---

6699cb66d4456f2d61b3ac3f8d14ce81df2437eb
diff --cc NEWS
index 1b16d34,84a8b6a..b71dc27
--- a/NEWS
+++ b/NEWS
@@@ -2,25 -2,22 +2,41 @@@ Starting with 1.47, changes marked wit
  apply to that specific program only; other changes apply to all of
  them.
  
 +Changes in 3.70:
 +	* PXELINUX: Support enhanced capabilities when running on top
 +	  of gPXE (http://www.etherboot.org/).  In particular, support
 +	  URL-style syntax for filenames, and any protocol that gPXE
 +	  supports (except, currently, iSCSI and AoE.)  This feature
 +	  is currently highly experimental.
 +	* Substantial infrastructure changes to support files whose
 +	  length aren't known at open time (typically network
 +	  connections.)  Please note that the semantics of some of the
 +	  comboot APIs have changed slightly; please see doc/comboot.doc.
 +	* PXELINUX: We no longer require a TFTP server which supports
 +	  the tsize option for all transfers.
 +	* PXELINUX: EXTREMELY EXPERIMENTAL: Support running on top of
 +	  the gPXE "PXEXT" PXE API extensions included with gPXE
 +	  0.9.4(?) or higher.  This allows booting over other
 +	  protocols than TFTP.
 +	* PXELINUX: Integrate with the gPXE source base; unified image
 +	  now included as "gpxelinux.0".
 +
+ Changes in 3.63:
+ 	* Fix errors in the PCI and DMI detection modules (Erwan Velu,
+ 	  Sebastian Herbszt).
+ 	* Fix host dependencies and other issues in the build system.
+ 	* PXELINUX: Allow class E addresses as unicast.
+ 	* sdi.c32: module to load Microsoft System Deployment Images.
+ 	  For additional information, please see:
+ 	    http://msdn2.microsoft.com/en-us/library/ms838543.aspx
+ 	* EXTLINUX: Correct reading directories with deleted entries.
+ 	* Shuffle library: correct the handling of certain geometries
+ 	  (an upward move with source material blocking the move); as
+ 	  required by sdi.c32 but theoretically possible for other
+ 	  formats as well.
+ 	* Add "make netinstall" to install /tftpboot.
+ 	* Fix some documentation files that didn't get moved/renamed.
+ 
  Changes in 3.62:
  	* Clean up garbage after "aborted." message.
  	* Clean up memdump.com filenames.
diff --cc com32/modules/Makefile
index 8a8827e,690183e..ff42a34
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@@ -53,7 -53,7 +53,8 @@@ COM32DIR = $(AUXDIR)/com3
  
  MODULES	  = chain.c32 ethersel.c32 mboot.c32 dmitest.c32 cpuidtest.c32 \
  	    pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 meminfo.c32 \
- 	    sanboot.c32
 -	    sdi.c32
++	    sdi.c32 sanboot.c32
++
  TESTFILES =
  
  all: $(MODULES) $(TESTFILES)