Merge lp:~darkmuggle-deactivatedaccount/ubuntu/oneiric/ipxe/oneiric into lp:ubuntu/oneiric/ipxe

[Ben Howard]

The current code base in lp:ubuntu/ipxe does not compile. Instead it loops on the file linuxprefix.S. This file was removed upstream.

LP: #821725 was filed against this.

[Dave Walker (davewalker)]

Hi Ben!

Thanks for pushing this, i think it needs a "bzr" add to add the patch, and a relevant entry in debian/changelog. Note, that you can also combine the other ipxe bug you are working on.

Thanks!

review: Needs Fixing

[Ben Howard (darkmuggle-deactivatedaccount)]

> Hi Ben!
>
> Thanks for pushing this, i think it needs a "bzr" add to add the patch, and a
> relevant entry in debian/changelog. Note, that you can also combine the other
> ipxe bug you are working on.
>
> Thanks!

Thanks for catching that Dave. Re-pushed with changes. The other patch is not ready yet; I thought it prudent to get this fix in first and then push my changes in after we have a working patch to keep the number of moving bits small for now.

[Dave Walker (davewalker)]

Great!

I made two additional commits before uploaded. These were:
 - Run 'update-maintainer', if we introduce a delta with Debian, we change the maintainer to an @ubuntu.com address. This is normally the catchall Ubuntu Developers Discuss mailing list. (the script handles this for us).

 - Merged in patch applied status.

Additionally, we tend to add patch tagging (http://dep.debian.net/deps/dep3/) to the patches which makes future maintenance much easier; but in this case I think it ok.

If the updated Debian package lands before the other changes you are making to this package, we should sync out the diff.

Uploading... thanks!

review: Approve

[Dave Walker (davewalker)]

Ah - I also added the bug number into debian/changelog which will close the bug that this is addressing.

Good work!

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-11 19:35:36 +0000
+++ debian/changelog	2011-08-06 16:06:36 +0000
@@ -1,3 +1,10 @@
+ipxe (1.0.0+git-1.293e34-2ubuntu1) oneiric; urgency=low
+
+  * debian/patches/remove-linuxprefix-resolve-ftbfs.patch: [Removed 
+    linuxprefix.S, which was causing infinite loop during compile]
+
+ -- Ben Howard <[e-mail]>  Fri, 05 Aug 2011 16:56:50 -0600
+
 ipxe (1.0.0+git-1.293e34-2) unstable; urgency=low
 
   * Add some missing copyrights and licenses to the copyright files.
 
=== added file 'debian/patches/remove-linuxprefix-resolve-ftbfs.patch'
--- debian/patches/remove-linuxprefix-resolve-ftbfs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-linuxprefix-resolve-ftbfs.patch	2011-08-06 16:06:36 +0000
@@ -0,0 +1,63 @@
+Index: ipxe/src/arch/i386/prefix/linuxprefix.S
+===================================================================
+--- ipxe.orig/src/arch/i386/prefix/linuxprefix.S	2011-08-05 16:56:49.028882032 -0600
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,28 +0,0 @@
+-#include <linux/unistd.h>
+-
+-	.section ".text"
+-	.code32
+-	.globl _linux_start
+-	.type _linux_start, @function
+-
+-_linux_start:
+-	xorl	%ebp, %ebp
+-
+-	popl	%esi       // save argc
+-	movl	%esp, %edi // save argv
+-
+-	andl	$~15, %esp // 16-byte align the stack
+-
+-	pushl	%edi // argv -> C arg2
+-	pushl	%esi // argc -> C arg1
+-
+-	call	save_args
+-
+-	/* Our main doesn't use any arguments */
+-	call	main
+-
+-	movl	%eax, %ebx // rc -> syscall arg1
+-	movl	$__NR_exit, %eax
+-	int	$0x80
+-
+-	.size _linux_start, . - _linux_start
+Index: ipxe/src/arch/x86_64/prefix/linuxprefix.S
+===================================================================
+--- ipxe.orig/src/arch/x86_64/prefix/linuxprefix.S	2011-08-05 16:56:49.058882032 -0600
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,25 +0,0 @@
+-#include <linux/unistd.h>
+-
+-	.section ".text"
+-	.code64
+-	.globl _linux_start
+-	.type _linux_start, @function
+-
+-_linux_start:
+-	xorq	%rbp, %rbp
+-
+-	popq	%rdi       // argc -> C arg1
+-	movq	%rsp, %rsi // argv -> C arg2
+-
+-	andq	$~15, %rsp // 16-byte align the stack
+-
+-	call	save_args
+-
+-	/* Our main doesn't use any arguments */
+-	call	main
+-
+-	movq	%rax, %rdi // rc -> syscall arg1
+-	movq	$__NR_exit, %rax
+-	syscall
+-
+-	.size _start, . - _start
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-11 19:35:36 +0000
+++ debian/patches/series	2011-08-06 16:06:36 +0000
@@ -1,1 +1,2 @@
 baseroms-target.diff
+remove-linuxprefix-resolve-ftbfs.patch