From f8be57919038b766faded1c939d359b5267cf22c Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@redhat.com>
Date: May 17 2013 10:57:37 +0000
Subject: Rebase to latest upstream git snapshot


---

diff --git a/ipxe-asm.patch b/ipxe-asm.patch
index f4b2a0d..ee1ba05 100644
--- a/ipxe-asm.patch
+++ b/ipxe-asm.patch
@@ -1,8 +1,7 @@
-diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c
-index b8e73a0..5f8ed07 100644
---- a/src/arch/i386/interface/pxe/pxe_call.c
-+++ b/src/arch/i386/interface/pxe/pxe_call.c
-@@ -265,12 +265,14 @@ int pxe_start_nbp ( void ) {
+diff -rup ipxe-20130517-gitc4bce43/src/arch/i386/interface/pxe/pxe_call.c ipxe-20130517-gitc4bce43.new/src/arch/i386/interface/pxe/pxe_call.c
+--- ipxe-20130517-gitc4bce43/src/arch/i386/interface/pxe/pxe_call.c	2013-05-16 15:41:20.000000000 +0100
++++ ipxe-20130517-gitc4bce43.new/src/arch/i386/interface/pxe/pxe_call.c	2013-05-17 10:55:13.282095767 +0100
+@@ -271,12 +271,14 @@ int pxe_start_nbp ( void ) {
  		DBG ( "Restarting NBP (%x)\n", jmp );
  
  	/* Far call to PXE NBP */
@@ -14,17 +13,17 @@ index b8e73a0..5f8ed07 100644
  					   "sti\n\t"
  					   "lcall $0, $0x7c00\n\t"
 -					   "addw $4, %%sp\n\t" )
-+					   "addw $4, %%sp\n\t" 
++					   "addw $4, %%sp\n\t"
 +					   "popl %%ebp\n\t" )
- 			       : "=a" ( rc ), "=b" ( discard_b ),
+ 			       : "=a" ( status ), "=b" ( discard_b ),
  				 "=c" ( discard_c ), "=d" ( discard_d ),
  				 "=D" ( discard_D )
-@@ -278,7 +280,7 @@ int pxe_start_nbp ( void ) {
+@@ -284,7 +286,7 @@ int pxe_start_nbp ( void ) {
  			         "c" ( rm_cs ),
  			         "d" ( virt_to_phys ( &pxenv ) ),
  				 "D" ( __from_text16 ( &ppxe ) )
 -			       : "esi", "ebp", "memory" );
 +			       : "esi", "memory" );
+ 	if ( status )
+ 		return -EPXENBP ( status );
  
- 	return rc;
- }
diff --git a/ipxe.spec b/ipxe.spec
index 66ea7c0..124469c 100644
--- a/ipxe.spec
+++ b/ipxe.spec
@@ -31,12 +31,12 @@
 #
 # And then change these two:
 
-%global date 20130103
-%global hash 717279a
+%global date 20130517
+%global hash c4bce43
 
 Name:    ipxe
 Version: %{date}
-Release: 3.git%{hash}%{?dist}
+Release: 1.git%{hash}%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -181,6 +181,9 @@ done
 %endif
 
 %changelog
+* Fri May 17 2013 Daniel P. Berrange <berrange@redhat.com> - 20130517-1.gitc4bce43
+- Update to latest upstream snapshot
+
 * Fri May 17 2013 Daniel P. Berrange <berrange@redhat.com> - 20130103-3.git717279a
 - Fix build with GCC 4.8 (rhbz #914091)
 
diff --git a/sources b/sources
index b0d42db..b0a32de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-028f4efe40197717a6d696ea3d2d7f6e  ipxe-20130103-git717279a.tar.gz
+a9ed923fa0b9b5509d2157806c5120c7  ipxe-20130517-gitc4bce43.tar.gz