rpms/ipxe
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to latest upstream git snapshot

Browse Source
This commit is contained in:
Daniel P. Berrange 2013-05-17 11:57:37 +01:00
parent 42e70a96d5
commit f8be579190
3 changed files with 16 additions and 14 deletions

19
ipxe-asm.patch
View File

@ -1,8 +1,7 @@
diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c 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
index b8e73a0..5f8ed07 100644 --- ipxe-20130517-gitc4bce43/src/arch/i386/interface/pxe/pxe_call.c 2013-05-16 15:41:20.000000000 +0100
--- a/src/arch/i386/interface/pxe/pxe_call.c +++ ipxe-20130517-gitc4bce43.new/src/arch/i386/interface/pxe/pxe_call.c 2013-05-17 10:55:13.282095767 +0100
+++ b/src/arch/i386/interface/pxe/pxe_call.c @@ -271,12 +271,14 @@ int pxe_start_nbp ( void ) {
@@ -265,12 +265,14 @@ int pxe_start_nbp ( void ) {
DBG ( "Restarting NBP (%x)\n", jmp ); DBG ( "Restarting NBP (%x)\n", jmp );
/* Far call to PXE NBP */ /* Far call to PXE NBP */
@ -14,17 +13,17 @@ index b8e73a0..5f8ed07 100644
"sti\n\t" "sti\n\t"
"lcall $0, $0x7c00\n\t" "lcall $0, $0x7c00\n\t"
- "addw $4, %%sp\n\t" ) - "addw $4, %%sp\n\t" )
+ "addw $4, %%sp\n\t" + "addw $4, %%sp\n\t"
+ "popl %%ebp\n\t" ) + "popl %%ebp\n\t" )
: "=a" ( rc ), "=b" ( discard_b ), : "=a" ( status ), "=b" ( discard_b ),
"=c" ( discard_c ), "=d" ( discard_d ), "=c" ( discard_c ), "=d" ( discard_d ),
"=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 ), "c" ( rm_cs ),
"d" ( virt_to_phys ( &pxenv ) ), "d" ( virt_to_phys ( &pxenv ) ),
"D" ( __from_text16 ( &ppxe ) ) "D" ( __from_text16 ( &ppxe ) )
- : "esi", "ebp", "memory" ); - : "esi", "ebp", "memory" );
+ : "esi", "memory" ); + : "esi", "memory" );
if ( status )
return -EPXENBP ( status );
return rc;
}

9
ipxe.spec
View File

@ -31,12 +31,12 @@
# #
# And then change these two: # And then change these two:
%global date 20130103 %global date 20130517
%global hash 717279a %global hash c4bce43
Name: ipxe Name: ipxe
Version: %{date} Version: %{date}
Release: 3.git%{hash}%{?dist} Release: 1.git%{hash}%{?dist}
Summary: A network boot loader Summary: A network boot loader
Group: System Environment/Base Group: System Environment/Base
@ -181,6 +181,9 @@ done
%endif %endif
%changelog %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 * Fri May 17 2013 Daniel P. Berrange <berrange@redhat.com> - 20130103-3.git717279a
- Fix build with GCC 4.8 (rhbz #914091) - Fix build with GCC 4.8 (rhbz #914091)

2
sources
View File

@ -1 +1 @@
028f4efe40197717a6d696ea3d2d7f6e ipxe-20130103-git717279a.tar.gz a9ed923fa0b9b5509d2157806c5120c7 ipxe-20130517-gitc4bce43.tar.gz