Merge ~paelzer/ubuntu/+source/ipxe:merge-ipxe-groovy-36a4c85-5 into ubuntu/+source/ipxe:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4116/+packages

FYI I've had some debug enabled to ensure the non EFI roms kept https enabled:
70398 grep -H __feature_https src/bin-i386-pcbios/*.tmp.map src/bin-x86_64-efi/*drv*.map || /bin/true
70399 src/bin-i386-pcbios/808610d3.rom.tmp.map: 0x0000000000027b10 __feature_https
70400 src/bin-i386-pcbios/808610d3.rom.tmp.map:00027b10 g O .textdata»00000004 .hidden __feature_https
70401 src/bin-i386-pcbios/82540em.rom.tmp.map: 0x0000000000027b10 __feature_https
70402 src/bin-i386-pcbios/82540em.rom.tmp.map:00027b10 g O .textdata»·00000004 .hidden __feature_https
70403 src/bin-i386-pcbios/eepro100.rom.tmp.map: 0x00000000000277fc __feature_https
70404 src/bin-i386-pcbios/eepro100.rom.tmp.map:000277fc g O .textdata»00000004 .hidden __feature_https
70405 src/bin-i386-pcbios/ipxe.lkrn.tmp.map: 0x00000000000bdfe0 __feature_https
70406 src/bin-i386-pcbios/ipxe.lkrn.tmp.map:000bdfe0 g O .textdata»···00000004 .hidden __feature_https
70407 src/bin-i386-pcbios/ipxe.pxe.tmp.map: 0x00000000000be100 __feature_https
70408 src/bin-i386-pcbios/ipxe.pxe.tmp.map:000be100 g O .textdata»00000004 .hidden __feature_https
70409 src/bin-i386-pcbios/ns8390.rom.tmp.map: 0x0000000000027330 __feature_https
70410 src/bin-i386-pcbios/ns8390.rom.tmp.map:00027330 g O .textdata»··00000004 .hidden __feature_https
70411 src/bin-i386-pcbios/pcnet32.rom.tmp.map: 0x0000000000027490 __feature_https
70412 src/bin-i386-pcbios/pcnet32.rom.tmp.map:00027490 g O .textdata»·00000004 .hidden __feature_https
70413 src/bin-i386-pcbios/rtl8139.rom.tmp.map: 0x0000000000027c50 __feature_https
70414 src/bin-i386-pcbios/rtl8139.rom.tmp.map:00027c50 g O .textdata»·00000004 .hidden __feature_https
70415 src/bin-i386-pcbios/undionly.kkpxe.tmp.map: 0x0000000000027190 __feature_https
70416 src/bin-i386-pcbios/undionly.kkpxe.tmp.map:00027190 g O .textdata»··00000004 .hidden __feature_https
70417 src/bin-i386-pcbios/undionly.kpxe.tmp.map: 0x0000000000027190 __feature_https
70418 src/bin-i386-pcbios/undionly.kpxe.tmp.map:00027190 g O .textdata»···00000004 .hidden __feature_https
70419 src/bin-i386-pcbios/virtio-net.rom.tmp.map: 0x0000000000027bd0 __feature_https
70420 src/bin-i386-pcbios/virtio-net.rom.tmp.map:00027bd0 g O .textdata»··00000004 .hidden __feature_https
70421 src/bin-i386-pcbios/vmxnet3.rom.tmp.map: 0x0000000000026f10 __feature_https
70422 src/bin-i386-pcbios/vmxnet3.rom.tmp.map:00026f10 g O .textdata»·00000004 .hidden __feature_https
70423 dh override_dh_auto_build

That is exactly as intended in the bug.

The rest is a merge that is somewhat complex due to us being ahead for 2 years and thereby gathering a bunch of Delta. A lot can be dropped now - it just is a long squashing session from split to logical.

To help understan...

[Christian Ehrhardt  (paelzer)]

Note: It might be very useful to push this to groovy soon (as part of the merge) and continue the SRU after it has stayed there for a while without negative reports (maybe after my PTO, where I also can better fix up any mess that I might cause).

[Christian Ehrhardt  (paelzer)]

FYI: I checked one more thing with the maintainer - https://bugs.launchpad.net/ipxe/+bug/1882671/comments/22
 about the toggling of config=QEMU

[Andreas Hasenack (ahasenack)]

Ok, will do this in several steps.

First bit:

This commit is missing the mention of d/control:
commit f52d57afafbd9d2de5905263d701f87b374194dc
Author: Christian Ehrhardt <email address hidden>
Date: Tue Aug 29 15:11:37 2017 +0200

    d/util/check-rom-sizes, d/rules: check sizes of generated roms (LP: #1713490)

    Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/control b/debian/control
index d9b6e476..c85178bf 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Package: ipxe-qemu
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
+Breaks: qemu-system-x86 (<< 1:2.11+dfsg-1ubuntu1~)
 Description: PXE boot firmware - ROM images for qemu
  iPXE is network boot firmware. It supports a variety of network cards,
  including some wireless cards, and variety of network protocols (traditional
....

From an older d/changelog, it's this probably: "- d/control: break older qemu versions to ensure the new sized roms"

Do we still need this breaks, btw?

[Andreas Hasenack (ahasenack)]

Since this is a complicated merge, I'm going through the logical in more detail. I think you missed a consolidation step (on purpose perhaps?) as there are commits adding patches and later one removing them:

2ae0e4801eadae1d064ef1c50cfc608ec200caea
DROP (Debian): drop patches no more needed with 20180124.fbe8c52d
This drops:
0002-Don-t-use-libiberty.patch
0004-fix_no-pie_option.patch
0006-build-Fix-.ids.o-creation-for-drivers-not-in-the-all.patch
0007-build-Remove-nested-my-declaration.patch

Which are indeed not in pkg/ubuntu/devel at the moment. But they were added by these commits also inside the logical chunk:
60ca2e05 0002-Don-t-use-libiberty.patch
d4ca5cdc 0004-fix_no-pie_option.patch
c9ce6c19 0006 and 0007 patches

So, since the logical (and I'm talking about lp1884758/old/debian..lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3) adds them and removes them later on, couldn't these just be removed from logical entirely, and not just "scheduled" for removal when you apply this on top of new/debian?

review: Needs Information

[Andreas Hasenack (ahasenack)]

If yes, with less commits, this would make the merge simpler, and the range-diff output also simples.

[Christian Ehrhardt  (paelzer)]

Basic regression tests look good (the one error is known until qemu 5.5 lands)

prep (x86_64) : Pass 25 F/S/N 0/0/0 - RC 0 (18 min 68875 lin)
migrate (x86_64) : Pass 575 F/S/N 1/0/0 - RC 1 (167 min 442854 lin)
cross (x86_64) : Pass 52 F/S/N 0/1/3 - RC 0 (105 min 93386 lin)
misc (x86_64) : Pass 146 F/S/N 0/0/0 - RC 0 (71 min 82562 lin)

560bc9a... by Christian Ehrhardt  on 2020-06-29

d/util/check-rom-sizes, d/rules: check sizes of generated roms (LP: #1713490)

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

The non mentioning of d/control in f52d57afafbd9d2de5905263d701f87b374194dc is a good catch.
In fact the CL is right about what "should happen". This is a delta that can be dropped after Focal.
I've modified the commit and adapted the changelog.

[Christian Ehrhardt  (paelzer)]

pushed the updated branch

[Christian Ehrhardt  (paelzer)]

@andreas about the addition&removal of patches like 0002-Don-t-use-libiberty.patch
This was due to the "going ahead of Debian". In fact at some point we reverted to go onto an earlier version, this made these patches "again being required" and later on when moving forward got removed again.

This wasn't exactly the same as when we usually add/remove patches. And I thought the history is more readable the way I presented them.

If you want I can squash them away.
I have made the former logical tag -v6 and pushed a new logical tag.

P.S. That is the reason there are multiple logical..-v* tags in case you ever wonder how I came from split to the final --logical (to be able to trace the steps).

This squashed the following commits into a no-op:
  d4ca5cdc4 DROP (upsteram): - d/p/0004-fix_no-pie_option.patch: correct -no-pie option to build without pie
  60ca2e055 DROP (Debian) - This brings back debian/patches/0002-Don-t-use-libiberty.patch as needed on the older source.
  c9ce6c192 DROP (upstream): fix FTBFS with newer perl versions
  2ae0e4801 DROP (Debian): drop patches no more needed with 20180124.fbe8c52d

The updated lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3 should match what you have expected.

To ssh://git.launchpad.net/~paelzer/ubuntu/+source/ipxe
 * [new tag] lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v6 -> lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v6
 + 6ced0f108...a0fbb52a7 lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3 -> lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3 (forced update)

[Christian Ehrhardt  (paelzer)]

The discussion on the HTTPS/config enabling/disabling clarified that we don't need to change the config=qemu behavior on legacy roms.

I adapted the changelog and the former
commit 8227ee968a9480153c0419fc15a92dc716826712
Author: Christian Ehrhardt <email address hidden>
Date: Wed Jun 24 13:24:30 2020 +0200

    - d/rules: only enable https on non EFI roms and CONFIG=qemu only on EFI
      roms. This lets EFI handle https itself and avoids breakage in TPL
      manipulations (LP: #1882671)

I force pushed the branch to reflect this

[Andreas Hasenack (ahasenack)]

Thanks for -v6, it made the range-diff easier to read and follow. I saw the version revert, and patches coming back, and later being dropped, and I think it's a perfectly valid case for removing the commits, as consolidating the logical is one of the objectives of that step. I understand that it's quite the squashing, and might make a reviewer wonder about what happened. When I do something like that, I usually mention it in detail in the MP. It's just a matter of preference, and I used your -v6 tag for this review.

Continuing...

[Andreas Hasenack (ahasenack)]

Having checked out the merge branch, with all our changes on top of new/debian, I see that the enable-https patch, from this commit (first one on top of new/debian):

commit 2fa82ccd07a6f1360bc357cf1a45490e347c35c0
Author: Christian Ehrhardt <email address hidden>
Date: Thu Aug 17 08:28:19 2017 +0200

    - d/p/enable-https.patch: Enable HTTPS support.

Is being removed in this commit:
commit 50a9def24c715aa5e44800c2068e43511d14238f
Author: Christian Ehrhardt <email address hidden>
Date: Wed Jun 24 13:24:30 2020 +0200

    - d/rules: only enable https on non EFI roms. This lets EFI handle https
      itself and avoids breakage in TPL manipulations (LP: #1882671)

Two things:

a) the 50a9def24c715aa5e44800c2068e43511d14238f commit is not mentioning that the enable-https.patch patch is being removed

b) d/changelog still lists the enable-https.patch patch as being part of the delta:
  * Merge with Debian unstable (LP: #1884758). Remaining changes:
    - d/p/enable-https.patch: Enable HTTPS support.

1c10dbf... by Christian Ehrhardt  on 2020-06-30

changelog: mention that d/p/enable-https.patch was replaced

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Thanks, I amended the change-log to properly mention it being dropped including the reason.
And I reworded the commit that removes it to mention as well.

[Andreas Hasenack (ahasenack)]

Ok, very big changes, I'm afraid that's all I can check, that the delta was carried with the changes you said you did, and nothing else stands out to me. Thanks for tackling this, should be less hard the next time!

review: Approve

[Christian Ehrhardt  (paelzer)]

"should be less hard the next time"
- Absolutely-

Thanks for suffering with me :-)

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ipxe
 * [new tag] upload/1.0.0+git-20190125.36a4c85-5ubuntu1 -> upload/1.0.0+git-20190125.36a4c85-5ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu1.dsc: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85.orig.tar.xz: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu1.debian.tar.xz: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu1_source.buildinfo: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

merged

diff --git a/debian/changelog b/debian/changelog
index 43e7fe9..dc0899c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,62 @@
+ipxe (1.0.0+git-20190125.36a4c85-5ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1884758). Remaining changes:
+    - Split grub integration from ipxe->grub-ipxe.
+      - d/control: add package and adapt dependencies
+      - d/[grub-]ipxe.install: move some files to grub-ipxe
+      - rename d/ipxe.post* to d/grub-ipxe-post*
+      [updated to match 1.0.0+git-20190125.36a4c85-5]
+    - d/util/check-rom-sizes, d/rules: check sizes of generated roms to avoid
+      accidentally breaking KVM live migration on updates/fixes.
+      [updated for new and dropped rom file names]
+    - debian/copyright: update copyright information to satisfy lintian
+      dep5 checks (LP: 1747071)
+    - Build ROMs for QEMU with CONFIG=qemu (LP: 1789319)
+      [updated to match 1.0.0+git-20190125.36a4c85-5 and be more verbose]
+    - debian/patches/handle-dhcp-nack.patch: Handle DHCP NAK and send a
+      re-discover. (LP 1707999)
+    - d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch: Strip 802.1Q VLAN 0
+      priority tags; Fixes PXE when VLAN tag is 0. (LP: 1805920)
+    - d/tree/ipxe/etc/grub.d/20_ipxe: Make grub-ipxe work under UEFI
+      (LP: 1811496)
+      - Use ipxe.efi under UEFI
+      - Save default entry when iPXE is selected
+    - d/tree/ipxe/etc/grub.d/20_ipxe: Identify ipxe grub menu entry in
+      an easier way (LP: 1858374)
+  * Dropped changes
+    - new upstream release 20190109.133f4c4 [superseded by new upstream]
+    - new upstream release 20180124.fbe8c52d [superseded by new upstream]
+    - Revert to the former git snapshot 20150424.a25a16d
+      [superseded by new upstream]
+      - This brings back debian/patches/0002-Don-t-use-libiberty.patch as needed
+        on the older source.
+      - Adapt d/p/0001-rom-change-banner-timeout.diff.patch to former state to
+        match old source.
+      - drop d/p/util-elf2efi-GNU_SOURCE.patch as it was not needed on old
+        source
+    - Fix FTBFS with newer perl versions [upstream]
+    - d/p/0004-fix_no-pie_option.patch: correct -no-pie option
+      to build without pie
+      [ still carried before ]
+    - Install ne.rom as pxe-ne2k_isa.rom
+      - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+      - d/ipxe-qemu.links: compat link for ne.rom
+      [ no more needed, was an old xen hvmloader bug ]
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu
+      to /usr/lib/ipxe/qemu.
+      [ no more needed, transition from trusty ]
+    - add new rom for vmxnet3 (LP 1737211) [in Debian now]
+    - Add e1000e firmware for qemu. (closes 884240) [in Debian now]
+    - d/control: ipxe-qemu breaks qemu-system-x86 <2.11 [no more needed]
+    - d/p/enable-https.patch: Enable HTTPS support.
+      [resolved per rom type in d/rules now]
+  * Added changes
+    - d/rules: only enable https on non EFI roms. This lets EFI handle https
+      itself and avoids breakage in TPL manipulations (LP: #1882671)
+    - d/util/check-rom-sizes: fix if size does exactly match
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 23 Jun 2020 16:23:52 +0200
+
 ipxe (1.0.0+git-20190125.36a4c85-5) unstable; urgency=medium
 
   * Cleanup src/bin correctly. (closes: #952275)
@@ -32,6 +91,179 @@ ipxe (1.0.0+git-20190125.36a4c85-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sat, 09 Feb 2019 17:41:37 +0100
 
+ipxe (1.0.0+git-20190109.133f4c4-0ubuntu3) focal; urgency=medium
+
+  [Alkis Georgopoulos]
+  * d/tree/ipxe/etc/grub.d/20_ipxe: Make grub-ipxe work under UEFI
+    (LP: #1811496)
+    - Use ipxe.efi under UEFI
+    - Save default entry when iPXE is selected
+  [Sharon Dagan]
+  - d/tree/ipxe/etc/grub.d/20_ipxe: Identify ipxe grub menu entry in
+    an easier way (LP: #1858374)
+
+ -- Rafael David Tinoco <[e-mail]>  Mon, 06 Jan 2020 18:59:25 +0000
+
+ipxe (1.0.0+git-20190109.133f4c4-0ubuntu2) disco; urgency=medium
+
+  * Add e1000e firmware for qemu. (closes: #884240)
+    - d/ipxe-qemu.install: install new rom
+    - d/util/check-rom-sizes: check new rom
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 19 Feb 2019 17:17:04 +0100
+
+ipxe (1.0.0+git-20190109.133f4c4-0ubuntu1) disco; urgency=medium
+
+  * Merge new upstream release 1.0.0+git-20190109.133f4c4
+    Remaining Changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - Split grub integration from ipxe->grub-ipxe.
+      - d/control: add package and adapt dependencies
+      - d/[grub-]ipxe.install: move some files to grub-ipxe
+      - rename d/ipxe.post* to d/grub-ipxe-post*
+    - Install ne.rom as pxe-ne2k_isa.rom
+      - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+      - d/ipxe-qemu.links: compat link for ne.rom
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu
+      to /usr/lib/ipxe/qemu.
+    - d/util/check-rom-sizes, d/rules: check sizes of generated roms to avoid
+      accidentially breaking KVM live migration on updates/fixes.
+    - handling of efi rom size changes in Bionic (LP 1713490)
+      - d/util/check-rom-sizes: bump efi rom sizes
+      - d/control: break older qemu versions to ensure the new sized roms
+        are only associated with new qemu versions.
+    - debian/patches/handle-dhcp-nack.patch: Handle DHCP NAK and send a
+      re-discover. (LP 1707999)
+    - updated debian/patches/util-elf2efi-GNU_SOURCE.patch to match latest
+      upstream.
+    - add new rom for vmxnet3 (LP 1737211)
+      - d/ipxe-qemu.install: install new rom
+        are only associated with new qemu versions.
+    - Build ROMs for QEMU with CONFIG=qemu (LP: 1789319)
+    - d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch: Strip 802.1Q VLAN 0
+      priority tags; Fixes PXE when VLAN tag is 0. (LP: 1805920)
+    - debian/copyright: update copyright information to satisfy lintian
+      dep5 checks (LP: 1747071)
+  * Dropped changes (upstream):
+    - debian/patches/fix-elf2efi-plt-relocation.diff: Cherry-pick fix from
+      ipxe devel mailing list to handle R_X86_64_PLT32 relocations.
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 09 Jan 2019 11:09:29 +0100
+
+ipxe (1.0.0+git-20180124.fbe8c52d-0ubuntu5) disco; urgency=medium
+
+  * d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch: Strip 802.1Q VLAN 0
+    priority tags; Fixes PXE when VLAN tag is 0. (LP: #1805920)
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 10 Dec 2018 16:26:42 -0500
+
+ipxe (1.0.0+git-20180124.fbe8c52d-0ubuntu4) cosmic; urgency=medium
+
+  * Build ROMs for QEMU with CONFIG=qemu (LP: #1789319)
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 10 Sep 2018 14:56:17 +0200
+
+ipxe (1.0.0+git-20180124.fbe8c52d-0ubuntu3) cosmic; urgency=medium
+
+  * debian/patches/fix-elf2efi-plt-relocation.diff: Cherry-pick fix from
+    ipxe devel mailing list to handle R_X86_64_PLT32 relocations.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 10 Sep 2018 14:27:35 +0200
+
+ipxe (1.0.0+git-20180124.fbe8c52d-0ubuntu2) bionic; urgency=medium
+
+  * debian/copyright: update copyright information to satisfy lintian
+    dep5 checks (LP: #1747071)
+  * d/p/enable-https.patch: adding proper dep3 header
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 05 Feb 2018 15:09:28 +0100
+
+ipxe (1.0.0+git-20180124.fbe8c52d-0ubuntu1) bionic; urgency=medium
+
+  * Merge new upstream release 20180124.fbe8c52d with last "new"
+    Ubuntu packaging 1.0.0+git-20161027.b991c67-1ubuntu1 and the
+    fixes since 1.0.0+git-20161027.b991c67+really20150424.a25a16d-1ubuntu1
+    Remaining Changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - Split grub integration from ipxe->grub-ipxe.
+      - d/control: add package and adapt dependencies
+      - d/[grub-]ipxe.install: move some files to grub-ipxe
+      - rename d/ipxe.post* to d/grub-ipxe-post*
+    - Install ne.rom as pxe-ne2k_isa.rom
+      - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+      - d/ipxe-qemu.links: compat link for ne.rom
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu
+      to /usr/lib/ipxe/qemu.
+    - d/util/check-rom-sizes, d/rules: check sizes of generated roms to avoid
+      accidentially breaking KVM live migration on updates/fixes.
+    - debian/patches/handle-dhcp-nack.patch: Handle DHCP NAK and send a
+      re-discover. (LP 1707999)
+  * Dropped changes (upstream):
+    - d/p/0004-fix_no-pie_option.patch: correct -no-pie option
+      to build without pie
+  * Added Changes:
+    - updated debian/patches/util-elf2efi-GNU_SOURCE.patch to match latest
+      upstream.
+    - add new rom for vmxnet3 (LP: #1737211)
+      - d/ipxe-qemu.install: install new rom
+      - d/util/check-rom-sizes: check new rom as well
+    - handling of efi rom size changes (LP: #1713490)
+      - d/util/check-rom-sizes: bump efi rom sizes
+      - d/control: break older qemu versions to ensure the new sized roms
+        are only associated with new qemu versions.
+    - d/util/check-rom-sizes: update description
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 24 Jan 2018 15:00:36 +0100
+
+ipxe (1.0.0+git-20161027.b991c67+really20150424.a25a16d-1ubuntu2) artful; urgency=medium
+
+  * debian/patches/handle-dhcp-nack.patch: Handle DHCP NAK and send a
+    re-discover. (LP: #1707999)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 12 Oct 2017 16:25:52 -0400
+
+ipxe (1.0.0+git-20161027.b991c67+really20150424.a25a16d-1ubuntu1) artful; urgency=medium
+
+  * Revert to the former git snapshot 20150424.a25a16d to fix changed
+    rom sizes that break cross release migrations (LP: #1713490).
+    This makes it effectively identical to 1.0.0+git-20150424.a25a16d-1ubuntu2
+    in regard to the upstream source, but keeps the changes to debian/*.
+    On next merge we need to either ensure that rom sizes don't change, or
+    that we can encapsulate that in qemu so that on forward migration it is
+    taken care off.
+    - This brings back debian/patches/0002-Don-t-use-libiberty.patch as needed
+      on the older source.
+    - Adapt d/p/0001-rom-change-banner-timeout.diff.patch to former state to
+      match old source.
+    - drop d/p/util-elf2efi-GNU_SOURCE.patch as it was not needed on old
+      source
+  * Fix FTBFS with newer perl versions (were dropped due to the revert above
+    but is needed to build in artful)
+    - d/p/0006-build-Fix-.ids.o-creation-for-drivers-not-in-the-all.patch
+    - d/p/0007-build-Remove-nested-my-declaration.patch
+  * d/util/check-rom-sizes, d/rules: check sizes of generated roms to avoid
+    accidentially breaking KVM live migration on updates/fixes.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 29 Aug 2017 10:37:57 +0200
+
+ipxe (1.0.0+git-20161027.b991c67-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian stable. Remaining changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - Split grub integration from ipxe->grub-ipxe.
+      - d/control: add package and adapt dependencies
+      - d/[grub-]ipxe.install: move some files to grub-ipxe
+      - rename d/ipxe.post* to d/grub-ipxe-post*
+    - Install ne.rom as pxe-ne2k_isa.rom
+      - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+      - d/ipxe-qemu.links: compat link for ne.rom
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu
+      to /usr/lib/ipxe/qemu.
+    - d/p/0004-fix_no-pie_option.patch: correct -no-pie option
+      to build without pie
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 17 Aug 2017 08:40:41 +0200
+
 ipxe (1.0.0+git-20161027.b991c67-1) unstable; urgency=medium
 
   * New snapshot. (closes: #799216)
@@ -39,6 +271,24 @@ ipxe (1.0.0+git-20161027.b991c67-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sun, 13 Nov 2016 13:35:11 +0100
 
+ipxe (1.0.0+git-20150424.a25a16d-1ubuntu2) yakkety; urgency=medium
+
+  * debian/patches/0004-fix_no-pie_option.patch: correct -no-pie
+    option to build without pie
+
+ -- Steve Beattie <[e-mail]>  Thu, 28 Apr 2016 23:55:40 -0700
+
+ipxe (1.0.0+git-20150424.a25a16d-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - d/control,grub-ipxe*: Split grub integration from ipxe->grub-ipxe.
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu to
+      /usr/lib/ipxe/qemu.
+    - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 08 Feb 2016 20:35:02 -0800
+
 ipxe (1.0.0+git-20150424.a25a16d-1) unstable; urgency=medium
 
   * New snapshot.
@@ -53,6 +303,35 @@ ipxe (1.0.0+git-20150424.a25a16d-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Wed, 29 Apr 2015 21:00:55 +0200
 
+ipxe (1.0.0+git-20141004.86285d1-1ubuntu3) vivid; urgency=medium
+
+  * ipxe.install: remove one more line which was supposed to be split out
+    into grub-ipxe.install.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 09 Feb 2015 11:01:16 -0600
+
+ipxe (1.0.0+git-20141004.86285d1-1ubuntu2) vivid; urgency=medium
+
+  * ipxe.install: remove /boot/ipxe.efi and ipxe.lkrn which are split out
+    into grub-ipxe.install.  (LP: #1418751)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 09 Feb 2015 10:51:22 -0600
+
+ipxe (1.0.0+git-20141004.86285d1-1ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. (LP: #1409057)  Remaining changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - d/control,grub-ipxe*: Split grub integration from ipxe->grub-ipxe.
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu to
+      /usr/lib/ipxe/qemu.
+    - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+  * Dropped changes, alternative fix in Debian:
+    - d/control: Add libiberty-dev to BD's to fix FTBFS.
+    - drop isolinux from build-deps and patch to augment ISOLINUX_BIN
+    - Drop transitional kvm-ipxe package since we are past 14.04
+
+ -- Serge Hallyn <[e-mail]>  Mon, 12 Jan 2015 10:32:26 -0600
+
 ipxe (1.0.0+git-20141004.86285d1-1) unstable; urgency=medium
 
   * New snapshot.
@@ -67,12 +346,50 @@ ipxe (1.0.0+git-20131111.c3d1e78-2.1) unstable; urgency=medium
 
  -- Juli?n Moreno Pati?o <[e-mail]>  Wed, 10 Sep 2014 11:06:28 -0500
 
+ipxe (1.0.0+git-20131111.c3d1e78-2ubuntu2) utopic; urgency=medium
+
+  * Fix FTBFS in utopic due to movement of isolinux.bin:
+    - add isolinux to build-deps
+    - add /usr/lib/ISOLINUX/isolinux.bin to ISOLINUX_BIN in
+      src/arch/i386/Makefile
+
+ -- Serge Hallyn <[e-mail]>  Tue, 12 Aug 2014 12:56:06 -0500
+
+ipxe (1.0.0+git-20131111.c3d1e78-2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - d/control,grub-ipxe*: Split grub integration from ipxe->grub-ipxe.
+    - d/control: Transition kvm-ipxe->ipxe-qemu for LTS->LTS upgrade.
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu to
+      /usr/lib/ipxe/qemu.
+    - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+  * Dropped changes, alternative fix in Debian:
+    - d/control: Add libiberty-dev to BD's to fix FTBFS.
+
+ -- James Page <[e-mail]>  Mon, 06 Jan 2014 09:55:25 +0000
+
 ipxe (1.0.0+git-20131111.c3d1e78-2) unstable; urgency=medium
 
   * Don't use libiberty. (closes: #730910)
 
  -- Bastian Blank <[e-mail]>  Sun, 22 Dec 2013 20:05:03 +0100
 
+ipxe (1.0.0+git-20131111.c3d1e78-1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - d/p/enable-https.patch: Enable HTTPS support.
+    - d/control,grub-ipxe*: Split grub integration from ipxe->grub-ipxe.
+    - d/control: Transition kvm-ipxe->ipxe-qemu for LTS->LTS upgrade.
+    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu to
+      /usr/lib/ipxe/qemu.
+    - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
+  * All other changes dropped in preference to upstream Debian
+    packaging.
+  * d/control: Add libiberty-dev to BD's to fix FTBFS.
+
+ -- James Page <[e-mail]>  Tue, 26 Nov 2013 17:50:47 +0000
+
 ipxe (1.0.0+git-20131111.c3d1e78-1) unstable; urgency=low
 
   * New snapshot.
@@ -91,6 +408,21 @@ ipxe (1.0.0+git-20131111.c3d1e78-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Thu, 21 Nov 2013 18:26:32 +0100
 
+ipxe (1.0.0+git-20130710.936134e-0ubuntu1) saucy; urgency=low
+
+  * New upstream snapshot:
+    - d/p/fix-bp-bug.patch: Dropped; included in snapshot.
+    - d/p/baseroms-target.diff: Dropped; no longer required.
+    - Refreshed all other patches.
+  * d/rules: Use date for snapshot prefix instead of increment.
+  * d/p/qemu-target-fix-names.diff: Consolidated into qemu-target.diff.
+  * d/p/*: Tidied redundant patches.
+  * d/control,rules: Move roms for use with qemu-kvm to ipxe-qemu, update
+    kvm-ipxe to be transitional.
+  * d/control: Drop Depends from grub-ipxe to ipxe as its not required.
+
+ -- James Page <[e-mail]>  Wed, 10 Jul 2013 12:23:26 +0100
+
 ipxe (1.0.0+git-20120202.f6840ba-3) unstable; urgency=low
 
   * Fix to break qemu-system instead of qemu. (closes: #658982)
@@ -119,6 +451,116 @@ ipxe (1.0.0+git-20120202.f6840ba-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Thu, 02 Feb 2012 12:40:26 +0100
 
+ipxe (1.0.0+git-4.d6b0b76-0ubuntu3) saucy; urgency=low
+
+  * debian/patches/fix-bp-bug.patch: fixes FTBFS (LP: #1194914)
+
+ -- Yolanda Robla <[e-mail]>  Thu, 27 Jun 2013 11:22:43 +0200
+
+ipxe (1.0.0+git-4.d6b0b76-0ubuntu2) raring; urgency=low
+
+  * d/control: Add ipxe-qemu virtual package for use with qemu.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 20 Nov 2012 16:08:21 -0600
+
+ipxe (1.0.0+git-4.d6b0b76-0ubuntu1) raring; urgency=low
+
+  * New upstream snapshot:
+    - d/p/iscsi*.patch: Dropped - included in snapshot.
+    - Refreshed all other patches.
+  * d/p/enable-https.patch: Enable HTTPS support (LP: #1025239).
+
+ -- James Page <[e-mail]>  Wed, 14 Nov 2012 15:47:31 +0000
+
+ipxe (1.0.0+git-3.55f6c88-0ubuntu5) quantal; urgency=low
+
+  * Fix input/output errors when using ipxe to boot from iSCSI storage
+    (LP: #1045923).
+    - d/p/iscsi-{report-reponse,send-padding-inline}.patch: Cherry picked
+      patches from upstream VCS which resolve two issues with iSCSI protocol
+      handling.
+
+ -- James Page <[e-mail]>  Thu, 06 Sep 2012 21:46:54 +0100
+
+ipxe (1.0.0+git-3.55f6c88-0ubuntu4) quantal; urgency=low
+
+  * debian/ipxe.install: add ipxe.dsk and ipxe.usb (LP: #1014005)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 21 Aug 2012 14:48:44 -0500
+
+ipxe (1.0.0+git-3.55f6c88-0ubuntu3) quantal; urgency=low
+
+  [ Serge Hallyn ]
+  * debian/patches/rom-set-banner-timeout-0.diff: set rom banner timeout
+    to 0.  (LP: #921230)
+  
+  [ Stefan Bader ]
+  * Modify the ROM names in of the allqemu target to use 8086100e instead
+    of e1000_82540 and ne instead of ne2k_isa (LP: #948323)
+
+ -- Serge Hallyn <[e-mail]>  Mon, 28 May 2012 11:57:48 -0500
+
+ipxe (1.0.0+git-3.55f6c88-0ubuntu2) quantal; urgency=low
+
+  * debian/grub.d/25_ipxe: removed the space after "Found iPXE image"
+    to match other grub-update script fragments (LP: #990378).
+  * debian/control: fixed some Lintian warnings.
+    - TODO: lots of missing Copyright information.
+
+ -- Martin-Éric Racine <[e-mail]>  Sat, 28 Apr 2012 11:41:28 +0300
+
+ipxe (1.0.0+git-3.55f6c88-0ubuntu1) precise; urgency=low
+
+  [ Marc Cluet ]
+  * New upstream snapshot.
+  * Added rules for automatic git branch refresh.
+  * Changed rom target from allbaseroms to allroms.
+    - recommended behaviour by upstream, building all full roms is neither
+      recommended nor a desired user experience
+  * Added new target allqemu for qemu package.
+    - created new build target to build full rom drivers just for qemu
+      package purposes
+  * Cleaned lintian errors from debian package
+    - Removed brace extension in ipxe.install
+    - Updated standards to 3.9.2
+    - Fixed copyright file not machine readable
+
+  [ James Page ]
+  * Updated get-orig-source target to generate git snapshots inline
+    with upstream version numbering being used by this package. 
+
+ -- Marc Cluet <[e-mail]>  Fri, 10 Feb 2012 16:21:23 +0000
+
+ipxe (1.0.0+git-2.149b50-1ubuntu4) precise; urgency=low
+
+  * Add missing Breaks/Replaces for kvm-ipxe split in
+    1.0.0+git-2.149b50-1ubuntu3 (LP: #905099).
+
+ -- Robie Basak <[e-mail]>  Fri, 16 Dec 2011 10:43:54 +0000
+
+ipxe (1.0.0+git-2.149b50-1ubuntu3) precise; urgency=low
+
+  * add new binary package, kvm-ipxe. The roms needed by kvm-ipxe are now only
+    provided by it, so
+    - make ipxe depend on kvm-ipxe.
+    - ipxe.links: reverse the links
+
+ -- Serge Hallyn <[e-mail]>  Fri, 25 Nov 2011 12:58:48 -0600
+
+ipxe (1.0.0+git-2.149b50-1ubuntu2) precise; urgency=low
+
+  * Provide a new binary package, grub-ipxe - for ipxe usage via grub.
+    - LP: #814038, Closes #626238
+
+ -- Ben Howard <[e-mail]>  Thu, 25 Aug 2011 11:03:52 -0600
+
+ipxe (1.0.0+git-2.149b50-1ubuntu1) oneiric; urgency=low
+
+  * Link Roms into /usr/share/qemu for consumption by
+    qemu-kvm.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Aug 2011 13:34:38 -0500
+
 ipxe (1.0.0+git-2.149b50-1) unstable; urgency=low
 
   * New snapshot.
@@ -139,3 +581,4 @@ ipxe (1.0.0+git-1.293e34-1) unstable; urgency=low
     - Remove linda infiniband driver.
 
  -- Bastian Blank <[e-mail]>  Sun, 03 Apr 2011 11:32:56 +0200
+
diff --git a/debian/control b/debian/control
index 5b99994..fea0238 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ipxe
 Section: admin
 Priority: optional
-Maintainer: Bastian Blank <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bastian Blank <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12),
  dpkg-source-gitarchive,
@@ -16,7 +17,7 @@ Vcs-Browser: https://salsa.debian.org/waldi/ipxe
 Package: ipxe
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ipxe-qemu, grub-ipxe, ${misc:Depends}
 Description: PXE boot firmware
  iPXE is network boot firmware.  It supports a variety of network cards,
  including some wireless cards, and variety of network protocols (traditional
@@ -44,3 +45,15 @@ Description: PXE boot firmware - ROM images for qemu
  .
  This package provides boot code for the qemu emulated network cards in
  as boot ROMs.
+
+Package: grub-ipxe
+Architecture: all
+Suggests: grub-pc (>= 1.96)
+Depends: ${misc:Depends}
+Description: Network booting from GRUB using iPXE
+ iPXE is network boot firmware.  It supports a variety of network cards,
+ including some wireless cards, and variety of network protocols (traditional
+ DHCP, BOOTP and TFTP and also HTTP, iSCSI, SAN via FCoE and Infiniband). It
+ supports scripting.
+ .
+ This package adds a menu entry to grub2 for network booting using iPXE.
diff --git a/debian/copyright b/debian/copyright
index 3593fa7..2b11fb4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,85 +3,501 @@ Upstream-Name: ipxe
 Source: git://git.ipxe.org/ipxe.git
 
 Files: *
-License: GPL-2+
+Copyright: *No copyright*
+License: GPL-2+ or UBDL
 
-Files:
- src/arch/i386/prefix/dskprefix.S
- src/core/pcmcia.c
- src/core/string.c
- src/core/stringextra.c
- src/drivers/infiniband/*_PRM.h
- src/drivers/infiniband/qib_*_regs.h
- src/drivers/net/cs89x0.*
- src/drivers/net/e1000/*
- src/drivers/net/e1000e/*
- src/drivers/net/hfa384x.h
- src/drivers/net/igb/*
- src/drivers/net/igbvf/*
- src/drivers/net/myri10ge*
+Files: src/drivers/net/hfa384x.h
  src/drivers/net/p80211hdr.h
- src/drivers/net/phantom/nxhal_nic_interface.h
- src/drivers/net/rtl818x/*
- src/drivers/net/skge.*
- src/drivers/net/sky2.*
- src/drivers/net/tg3.*
- src/drivers/net/vxge/*
  src/drivers/net/wlan_compat.h
- src/include/i82365.h
- src/include/ipxe/list.h
- src/include/ipxe/pci.h
- src/include/ipxe/pci_ids.h
- src/include/mii.h
- src/include/stddef.h
- src/include/string.h
+Copyright: 1999, AbsoluteValue Systems, Inc.
+License: GPL-2
+
+Files: src/arch/x86/prefix/dskprefix.S
+Copyright: 1991-1992, Linus Torvalds
+License: GPL-2
+
+Files: src/core/stringextra.c
+Copyright: 1991-1992, Linus Torvalds
+  2004, Tobias Lorenz
+License: GPL-2
+
+Files: src/drivers/infiniband/MT25218_PRM.h
+ src/drivers/infiniband/MT25408_PRM.h
+Copyright: 2004, Mellanox Technologies Ltd.
+License: GPL-2
+
+Files: src/drivers/infiniband/qib_7220_regs.h
+ src/drivers/infiniband/qib_7322_regs.h
+Copyright: 2008-2009, QLogic Corporation.
+License: GPL-2
+
+Files: src/arch/x86/core/basemem_packet.c
+ src/arch/x86/core/cachedhcp.c
+ src/arch/x86/core/rdtsc_timer.c
+ src/arch/x86/core/runtime.c
+ src/arch/x86/drivers/net/undi.c
+ src/arch/x86/drivers/net/undiload.c
+ src/arch/x86/drivers/net/undinet.c
+ src/arch/x86/drivers/net/undionly.c
+ src/arch/x86/drivers/net/undipreload.c
+ src/arch/x86/drivers/net/undirom.c
+ src/arch/x86/interface/pcbios/basemem.c
+ src/arch/x86/interface/pcbios/bios_console.c
+ src/arch/x86/interface/pcbios/e820mangler.S
+ src/arch/x86/interface/pcbios/fakee820.c
+ src/arch/x86/interface/pcbios/hidemem.c
+ src/arch/x86/interface/pcbios/memmap.c
+ src/arch/x86/interface/pcbios/pnpbios.c
+ src/arch/x86/hci/commands/pxe_cmd.c
+ src/arch/x86/image/bootsector.c
+ src/arch/x86/image/bzimage.c
+ src/arch/x86/image/elfboot.c
+ src/arch/x86/image/initrd.c
+ src/arch/x86/image/multiboot.c
+ src/arch/x86/image/pxe_image.c
+ src/arch/x86/image/sdi.c
+ src/arch/x86/interface/pcbios/bios_reboot.c
+ src/arch/x86/interface/pcbios/bios_smbios.c
+ src/arch/x86/interface/pcbios/bios_timer.c
+ src/arch/x86/interface/pcbios/int13.c
+ src/arch/x86/interface/pcbios/memtop_umalloc.c
+ src/arch/x86/interface/pcbios/pcibios.c
+ src/arch/x86/interface/pcbios/rtc_entropy.c
+ src/arch/x86/interface/pcbios/rtc_time.c
+ src/arch/x86/interface/pcbios/vesafb.c
+ src/arch/x86/interface/pxe/pxe_call.c
+ src/arch/x86/interface/pxe/pxe_entry.S
+ src/arch/x86/interface/pxe/pxe_file.c
+ src/arch/x86/interface/pxe/pxe_loader.c
+ src/arch/x86/interface/pxe/pxe_preboot.c
+ src/arch/x86/interface/pxe/pxe_tftp.c
+ src/arch/x86/interface/pxe/pxe_udp.c
+ src/arch/x86/interface/pxe/pxe_undi.c
+ src/arch/x86/interface/vmware/guestinfo.c
+ src/arch/x86/interface/vmware/guestrpc.c
+ src/arch/x86/interface/vmware/vmconsole.c
+ src/arch/x86/interface/vmware/vmware.c
+ src/arch/x86/prefix/exeprefix.S
+ src/arch/x86/prefix/isaromprefix.S
+ src/arch/x86/prefix/libprefix.S
+ src/arch/x86/prefix/mromprefix.S
+ src/arch/x86/prefix/pciromprefix.S
+ src/arch/x86/prefix/unlzma.S
+ src/arch/x86/transitions/liba20.S
+ src/arch/x86/transitions/librm_test.c
+ src/arch/x86/core/cpuid.c
+ src/arch/x86/core/cpuid_settings.c
+ src/arch/x86/core/debugcon.c
+ src/arch/x86/core/pcidirect.c
+ src/arch/x86/core/pic8259.c
+ src/arch/x86/core/pit8254.c
+ src/arch/x86/core/vram_settings.c
+ src/arch/x86/core/x86_bigint.c
+ src/arch/x86/core/x86_io.c
+ src/arch/x86/core/x86_string.c
+ src/arch/x86/core/x86_tcpip.c
+ src/arch/x86/drivers/hyperv/hyperv.c
+ src/arch/x86/drivers/xen/hvm.c
+ src/arch/x86/hci/commands/cpuid_cmd.c
+ src/arch/x86/include/bits/string.h
+ src/arch/x86/interface/efi/efix86_nap.c
+ src/interface/efi/efi_entropy.c
+ src/interface/efi/efiprefix.c
+ src/interface/efi/efidrvprefix.c
+ src/core/acpi.c
+ src/core/ansicol.c
+ src/core/ansicoldef.c
+ src/core/ansiesc.c
+ src/core/assert.c
+ src/core/base16.c
+ src/core/base64.c
+ src/core/basename.c
+ src/core/bitmap.c
+ src/core/blockdev.c
+ src/core/cpio.c
+ src/core/ctype.c
+ src/core/cwuri.c
+ src/core/debug.c
+ src/core/debug_md5.c
+ src/core/device.c
+ src/core/downloader.c
+ src/core/edd.c
+ src/core/exec.c
+ src/core/fbcon.c
+ src/core/getkey.c
+ src/core/getopt.c
+ src/core/image.c
+ src/core/init.c
+ src/core/interface.c
+ src/core/iobuf.c
+ src/core/isqrt.c
+ src/core/job.c
+ src/core/linebuf.c
+ src/core/lineconsole.c
+ src/core/list.c
+ src/core/log.c
+ src/core/malloc.c
+ src/core/memmap_settings.c
+ src/core/menu.c
+ src/core/monojob.c
+ src/core/null_reboot.c
+ src/core/null_sanboot.c
+ src/core/null_time.c
+ src/core/nvo.c
+ src/core/open.c
+ src/core/params.c
+ src/core/parseopt.c
+ src/core/pending.c
+ src/core/pinger.c
+ src/core/pixbuf.c
+ src/core/posix_io.c
+ src/core/process.c
+ src/core/profile.c
+ src/core/refcnt.c
+ src/core/resolv.c
+ src/core/settings.c
+ src/core/string.c
+ src/core/time.c
+ src/core/timer.c
+ src/core/uri.c
+ src/core/uuid.c
+ src/core/version.c
+ src/core/vsprintf.c
+ src/core/wchar.c
+ src/core/xfer.c
+ src/core/xferbuf.c
+ src/crypto/asn1.c
+ src/crypto/bigint.c
+ src/crypto/cbc.c
+ src/crypto/certstore.c
+ src/crypto/chap.c
+ src/crypto/cms.c
+ src/crypto/crypto_null.c
+ src/crypto/deflate.c
+ src/crypto/drbg.c
+ src/crypto/entropy.c
+ src/crypto/hash_df.c
+ src/crypto/hmac.c
+ src/crypto/hmac_drbg.c
+ src/crypto/md5.c
+ src/crypto/null_entropy.c
+ src/crypto/ocsp.c
+ src/crypto/privkey.c
+ src/crypto/random_nz.c
+ src/crypto/rbg.c
+ src/crypto/rootcert.c
+ src/crypto/rsa.c
+ src/crypto/sha1.c
+ src/crypto/sha224.c
+ src/crypto/sha256.c
+ src/crypto/sha384.c
+ src/crypto/sha512.c
+ src/crypto/sha512_224.c
+ src/crypto/sha512_256.c
+ src/crypto/x509.c
+ src/drivers/bitbash/bitbash.c
+ src/drivers/bitbash/i2c_bit.c
+ src/drivers/bitbash/spi_bit.c
+ src/drivers/block/ata.c
+ src/drivers/block/scsi.c
+ src/drivers/bus/cdc.c
+ src/drivers/bus/pci.c
+ src/drivers/bus/pci_settings.c
+ src/drivers/bus/pcibackup.c
+ src/drivers/bus/pcivpd.c
+ src/drivers/bus/usb.c
+ src/drivers/infiniband/mlx_bitops.h
+ src/drivers/infiniband/qib7322.c
+ src/drivers/infiniband/qib7322.h
+ src/drivers/infiniband/qib_genbits.pl
+ src/drivers/net/dm96xx.c
+ src/drivers/net/ecm.c
+ src/drivers/net/efi/nii.c
+ src/drivers/net/efi/snp.c
+ src/drivers/net/efi/snpnet.c
+ src/drivers/net/efi/snponly.c
+ src/drivers/net/intel.c
+ src/drivers/net/intelx.c
+ src/drivers/net/ipoib.c
+ src/drivers/net/mii.c
+ src/drivers/net/myson.c
+ src/drivers/net/natsemi.c
+ src/drivers/net/ncm.c
+ src/drivers/net/netfront.c
+ src/drivers/net/netvsc.c
+ src/drivers/net/phantom/nx_bitops.h
+ src/drivers/net/realtek.c
+ src/drivers/net/skeleton.c
+ src/drivers/net/smsc75xx.c
+ src/drivers/net/vmxnet3.c
+ src/drivers/net/vmxnet3.h
+ src/drivers/nvs/nvs.c
+ src/drivers/nvs/nvsvpd.c
+ src/drivers/nvs/spi.c
+ src/drivers/nvs/threewire.c
+ src/drivers/usb/ehci.c
+ src/drivers/usb/usbhub.c
+ src/drivers/usb/usbnet.c
+ src/drivers/usb/xhci.c
+ src/hci/commands/autoboot_cmd.c
+ src/hci/commands/config_cmd.c
+ src/hci/commands/console_cmd.c
+ src/hci/commands/dhcp_cmd.c
+ src/hci/commands/fcmgmt_cmd.c
+ src/hci/commands/ifmgmt_cmd.c
+ src/hci/commands/image_cmd.c
+ src/hci/commands/image_trust_cmd.c
+ src/hci/commands/ipstat_cmd.c
+ src/hci/commands/login_cmd.c
+ src/hci/commands/lotest_cmd.c
+ src/hci/commands/menu_cmd.c
+ src/hci/commands/neighbour_cmd.c
+ src/hci/commands/nvo_cmd.c
+ src/hci/commands/param_cmd.c
+ src/hci/commands/pci_cmd.c
+ src/hci/commands/ping_cmd.c
+ src/hci/commands/profstat_cmd.c
+ src/hci/commands/reboot_cmd.c
+ src/hci/commands/route_cmd.c
+ src/hci/commands/sanboot_cmd.c
+ src/hci/commands/sync_cmd.c
+ src/hci/commands/vlan_cmd.c
+ src/hci/editstring.c
+ src/hci/jumpscroll.c
+ src/hci/mucurses/widgets/editbox.c
+ src/hci/readline.c
+ src/hci/shell.c
+ src/hci/tui/login_ui.c
+ src/hci/tui/menu_ui.c
+ src/hci/tui/settings_ui.c
+ src/image/efi_image.c
+ src/image/elf.c
+ src/image/png.c
+ src/image/pnm.c
+ src/image/script.c
+ src/image/segment.c
+ src/include/errno.h
+ src/include/hci/ifmgmt_cmd.h
+ src/include/ipxe/bitops.h
+ src/include/ipxe/fip.h
+ src/interface/bofm/bofm.c
+ src/interface/efi/efi_autoboot.c
+ src/interface/efi/efi_bofm.c
+ src/interface/efi/efi_console.c
+ src/interface/efi/efi_debug.c
+ src/interface/efi/efi_driver.c
+ src/interface/efi/efi_file.c
+ src/interface/efi/efi_guid.c
+ src/interface/efi/efi_hii.c
+ src/interface/efi/efi_init.c
+ src/interface/efi/efi_pci.c
+ src/interface/efi/efi_reboot.c
+ src/interface/efi/efi_smbios.c
+ src/interface/efi/efi_snp.c
+ src/interface/efi/efi_snp_hii.c
+ src/interface/efi/efi_strings.c
+ src/interface/efi/efi_time.c
+ src/interface/efi/efi_timer.c
+ src/interface/efi/efi_uaccess.c
+ src/interface/efi/efi_umalloc.c
+ src/interface/efi/efi_utils.c
+ src/interface/efi/efi_wrap.c
+ src/interface/hyperv/vmbus.c
+ src/interface/linux/linux_entropy.c
+ src/interface/linux/linux_pci.c
+ src/interface/linux/linux_smbios.c
+ src/interface/linux/linux_time.c
+ src/interface/smbios/smbios.c
+ src/interface/smbios/smbios_settings.c
+ src/interface/xen/xenbus.c
+ src/interface/xen/xenstore.c
+ src/net/aoe.c
+ src/net/arp.c
+ src/net/dhcpopts.c
+ src/net/dhcppkt.c
+ src/net/eth_slow.c
+ src/net/ethernet.c
+ src/net/fakedhcp.c
+ src/net/fc.c
+ src/net/fcels.c
+ src/net/fcns.c
+ src/net/fcoe.c
+ src/net/fcp.c
+ src/net/fragment.c
+ src/net/icmp.c
+ src/net/icmpv4.c
+ src/net/icmpv6.c
+ src/net/infiniband.c
+ src/net/infiniband/ib_cm.c
+ src/net/infiniband/ib_mcast.c
+ src/net/infiniband/ib_mi.c
+ src/net/infiniband/ib_packet.c
+ src/net/infiniband/ib_pathrec.c
+ src/net/infiniband/ib_sma.c
+ src/net/infiniband/ib_smc.c
+ src/net/iobpad.c
+ src/net/ipv6.c
+ src/net/ndp.c
+ src/net/neighbour.c
+ src/net/netdev_settings.c
+ src/net/netdevice.c
+ src/net/nullnet.c
+ src/net/pccrc.c
+ src/net/ping.c
+ src/net/rarp.c
+ src/net/retry.c
+ src/net/rndis.c
+ src/net/socket.c
+ src/net/tcp/ftp.c
+ src/net/tcp/http.c
+ src/net/tcp/httpcore.c
+ src/net/tcp/https.c
+ src/net/tcp/iscsi.c
+ src/net/tcp/syslogs.c
+ src/net/tls.c
+ src/net/udp/dhcp.c
+ src/net/udp/dhcpv6.c
+ src/net/udp/slam.c
+ src/net/udp/syslog.c
+ src/net/udp/tftp.c
+ src/net/validator.c
+ src/net/vlan.c
+ src/tests/base16_test.c
+ src/tests/base64_test.c
+ src/tests/bigint_test.c
+ src/tests/bofm_test.c
+ src/tests/byteswap_test.c
+ src/tests/cms_test.c
+ src/tests/crc32_test.c
+ src/tests/deflate_test.c
+ src/tests/digest_test.c
+ src/tests/dns_test.c
+ src/tests/entropy_sample.c
+ src/tests/hash_df_test.c
+ src/tests/hmac_drbg_test.c
+ src/tests/ipv4_test.c
+ src/tests/ipv6_test.c
+ src/tests/list_test.c
+ src/tests/math_test.c
+ src/tests/md5_test.c
+ src/tests/memcpy_test.c
+ src/tests/memset_test.c
+ src/tests/ocsp_test.c
+ src/tests/pccrc_test.c
+ src/tests/pixbuf_test.c
+ src/tests/png_test.c
+ src/tests/pnm_test.c
+ src/tests/profile_test.c
+ src/tests/rsa_test.c
+ src/tests/setjmp_test.c
+ src/tests/settings_test.c
+ src/tests/sha1_test.c
+ src/tests/sha256_test.c
+ src/tests/sha512_test.c
+ src/tests/string_test.c
+ src/tests/tcpip_test.c
+ src/tests/test.c
+ src/tests/tests.c
+ src/tests/time_test.c
+ src/tests/uri_test.c
+ src/tests/vsprintf_test.c
+ src/tests/x509_test.c
+ src/usr/autoboot.c
+ src/usr/dhcpmgmt.c
+ src/usr/fcmgmt.c
+ src/usr/ifmgmt.c
+ src/usr/imgmgmt.c
+ src/usr/imgtrust.c
+ src/usr/ipstat.c
+ src/usr/lotest.c
+ src/usr/neighmgmt.c
+ src/usr/pingmgmt.c
+ src/usr/profstat.c
+ src/usr/prompt.c
+ src/usr/pxemenu.c
+ src/usr/route.c
+ src/usr/route_ipv4.c
+ src/usr/route_ipv6.c
+ src/usr/sync.c
+ src/util/Option/ROM.pm
+ src/util/disrom.pl
+ src/util/efifatbin.c
+ src/util/efirom.c
+ src/util/einfo.c
+ src/util/elf2efi.c
+ src/util/fixrom.pl
+ src/util/fnrec.pl
+ src/util/genkeymap.pl
+ src/util/licence.pl
+ src/util/mergerom.pl
+Copyright: 2004-2015, Michael Brown <[e-mail]>
+License: GPL-2+
+
+Files: src/drivers/net/cs89x0.*
+Copyright: Copyright, 1988-2008, Russell Nelson, Crynwr Software
 License: GPL-2
 
 Files:
- src/crypto/axtls/aes.c
- src/crypto/axtls/bigint.h
- src/crypto/axtls/crypto.h
-License: LGPL-2+
+ src/drivers/net/igbvf/*
+Copyright: 1999, - 2008, Intel Corporation
+License: GPL-2
+
+Files: src/drivers/net/igbvf/igbvf_main.c
+Copyright: 2009, Intel Corporation
+  2010, Eric Keller <[e-mail]>
+  2010, Red Hat Inc
+License: GPL-2
 
 Files:
- src/crypto/axtls/bigint.c
- src/crypto/axtls/bigint_impl.h
- src/crypto/axtls/rsa.c
- src/crypto/axtls/sha1.c
-License: LGPL-2.1+
+ src/drivers/net/myri10ge*
+Copyright: 2005-2010, Myricom, Inc
+License: GPL-2
 
 Files:
- src/drivers/net/ath5k/*
-Copyright:
- 2004-2009 Reyk Floeter <[e-mail]>
- 2006-2009 Nick Kossifidis <[e-mail]>
- 2007-2008 Jiri Slaby <[e-mail]>
- 2007-2008 Luis Rodriguez <[e-mail]>
- 2007-2008 Matthew W. S. Bell  <[e-mail]>
- 2007-2008 Michael Taylor <[e-mail]>
- 2007-2008 Pavel Roskin <[e-mail]>
- 2008-2009 Felix Fietkau <[e-mail]>
- 2009 Nick Kossifidis <[e-mail]>
-License:
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- . 
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ src/drivers/net/rtl818x/rtl8180_grf5101.c
+ src/drivers/net/rtl818x/rtl8180_max2820.c
+ src/drivers/net/rtl818x/rtl8180_sa2400.c
+ src/drivers/net/rtl818x/rtl8185_rtl8225.c
+ src/drivers/net/rtl818x/rtl818x.c
+ src/drivers/net/rtl818x/rtl818x.h
+Copyright: 2004-2007, Andrea Merello <[e-mail]>
+  2005-2007, Andrea Merello <[e-mail]>, et al
+License: GPL-2
+
+Files: src/drivers/net/skge.c
+ src/drivers/net/sky2.c
+Copyright: 2004-2005, Stephen Hemminger <[e-mail]>
+License: GPL-2
+
+Files: src/drivers/net/tg3/*
+Copyright: 2001-2003, Jeff Garzik ([e-mail])
+  2001-2004, David S. Miller ([e-mail])
+  2004, Sun Microsystems Inc
+  2000-2011, Broadcom Corporation
+License: GPL-2
+
+Files: src/drivers/net/vxge/*
+Copyright: 2002-2010, Neterion Inc
+License: GPL-2
+
+Files: src/include/i82365.h
+Copyright: 1999, David A. Hinds.
+License: GPL-2
+
+Files: src/include/mii.h
+Copyright: 1996, 1999, 2001, David S. Miller ([e-mail])
+License: GPL-2
 
 Files:
  src/drivers/bus/mca.c
  src/drivers/net/3c509.c
  src/drivers/net/3c529.c
+Copyright: *No copyright*
+License: BSD-2-clause
+
+Files:
  src/drivers/net/ns8390.h
- src/include/ipxe/ib_cmrc.h
- src/include/ipxe/ib_srp.h
- src/include/ipxe/srp.h
+Copyright: Martin Renters
 License: BSD-2-clause
 
 Files: src/drivers/net/3c509.h
@@ -99,12 +515,7 @@ Copyright:
  1994 Herb Peyerl <[e-mail]>
  1995 Serge Babkin
  2000 Shusuke Nisiyama <[e-mail]>
-License:
- This software may be used, modified, copied, distributed, and sold, in
- both source and binary form provided that the above copyright and these
- terms are retained. Under no circumstances are the authors responsible for
- the proper functioning of this software, nor do the authors assume any
- responsibility for damages incurred with its use.
+License: BSD-2-clause
 
 Files: src/drivers/net/3c595.h
 Copyright:
@@ -116,39 +527,7 @@ Copyright:
  1999 LightSys Technology Services, Inc.
  1999 Steve Smith
  2009 Thomas Miletich
-License:
- This program may be re-distributed in source or binary form, modified,
- sold, or copied for any purpose, provided that the above copyright message
- and this text are included with all source copies or derivative works, and
- provided that the above copyright message and this text are included in the
- documentation of any binary-only distributions.  This program is distributed
- WITHOUT ANY WARRANTY, without even the warranty of FITNESS FOR A PARTICULAR
- PURPOSE or MERCHANTABILITY.  Please read the associated documentation
-
-Files: src/include/ipxe/ibft.h
-Copyright:
- 2007 Fen Systems Ltd
- 2004,2007 IBM Corporation
-License:
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use, copy,
- modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .                       
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
+License: BSD-2-clause
 
 Files:
  src/net/infiniband/ib_cmrc.c
@@ -157,9 +536,9 @@ Copyright: 2009 Fen Systems Ltd <[e-mail]>
 License: BSD-2-clause
 
 Files:
- src/drivers/net/ath5k/ath5k.c
- src/drivers/net/ath5k/ath5k_rfkill.c
- src/drivers/net/ath5k/base.h
+ src/drivers/net/ath/ath5k/ath5k.c
+ src/drivers/net/ath/ath5k/ath5k_rfkill.c
+ src/drivers/net/ath/ath5k/base.h
 Copyright:
  2002-2007 Sam Leffler, Errno Consulting
  2004-2005 Atheros Communications, Inc.
@@ -167,16 +546,34 @@ Copyright:
  2007 Jiri Slaby <[e-mail]>
  2007 Luis R. Rodriguez <[e-mail]>
  2009 Tobias Doerffel <[e-mail]>
+ 2002-2007 Sam Leffler, Errno Consulting
 License: BSD-3-clause
 
+Files:
+ src/include/ipxe/ib_cmrc.h
+ src/include/ipxe/ib_srp.h
+ src/include/ipxe/srp.h
+Copyright: *No copyright*
+License: BSD-2-clause
+
 Files: src/include/ipxe/efi/*
-Copyright: 
+Copyright:
  2006-2010 Intel Corporation
  2008-2009 Apple
 License: BSD-3-clause
 
-Files: src/include/ipxe/efi/efi_*
-License: GPL-2+
+
+Files: src/include/ipxe/ibft.h
+Copyright:
+ 2007 Fen Systems Ltd
+ 2004,2007 IBM Corporation
+License: BSD-2-clause
+
+Files:
+ src/include/ipxe/list.h
+ src/include/ipxe/pci.h
+Copyright: *No copyright*
+License: GPL-2 or UBDL
 
 Files: debian/*
 Copyright: 2011 Bastian Blank <[e-mail]>
@@ -215,34 +612,6 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: LGPL-2+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-License: LGPL-2.1+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -287,3 +656,58 @@ License: BSD-3-clause
  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: UBDL
+ The GNU General Public License provides a legal guarantee that
+ software covered by it remains free (in the sense of freedom, not
+ price).  It achieves this guarantee by imposing obligations on anyone
+ who chooses to distribute the software.
+ .
+ Some of these obligations may be seen as unnecessarily burdensome.  In
+ particular, when the source code for the software is already publicly
+ and freely available, there is minimal value in imposing upon each
+ distributor the obligation to provide the complete source code (or an
+ equivalent written offer to provide the complete source code).
+ .
+ This Licence allows for the distribution of unmodified binaries built
+ from publicly available source code, without imposing the obligations
+ of the GNU General Public License upon anyone who chooses to
+ distribute only the unmodified binaries built from that source code.
+ .
+ The extra permissions granted by this Licence apply only to unmodified
+ binaries built from source code which has already been made available
+ to the public in accordance with the terms of the GNU General Public
+ Licence.  Nothing in this Licence allows for the creation of
+ closed-source modified versions of the Program.  Any modified versions
+ of the Program are subject to the usual terms and conditions of the
+ GNU General Public License.
+ .
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ This Licence applies to any Program or other work which contains a
+ notice placed by the copyright holder saying it may be distributed
+ under the terms of this Unmodified Binary Distribution Licence.  All
+ terms used in the text of this Licence are to be interpreted as they
+ are used in version 2 of the GNU General Public License as published
+ by the Free Software Foundation.
+ .
+ If you have made this Program available to the public in both source
+ code and executable form in accordance with the terms of the GNU
+ General Public License as published by the Free Software Foundation;
+ either version 2 of the License, or (at your option) any later
+ version, then you are hereby granted an additional permission to use,
+ copy, and distribute the unmodified executable form of this Program
+ (the "Unmodified Binary") without restriction, including the right to
+ permit persons to whom the Unmodified Binary is furnished to do
+ likewise, subject to the following conditions:
+ .
+ - when started running, the Program must display an announcement which
+   includes the details of your existing publication of the Program
+   made in accordance with the terms of the GNU General Public License.
+   For example, the Program could display the URL of the publicly
+   available source code from which the Unmodified Binary was built.
+ .
+ - when exercising your right to grant permissions under this Licence,
+   you do not need to refer directly to the text of this Licence, but
+   you may not grant permissions beyond those granted to you by this
+   Licence.
diff --git a/debian/grub-ipxe.install b/debian/grub-ipxe.install
new file mode 100644
index 0000000..7284a31
--- /dev/null
+++ b/debian/grub-ipxe.install
@@ -0,0 +1,3 @@
+debian/tree/ipxe/* .
+src/bin-i386-pcbios/ipxe.lkrn boot
+src/bin-x86_64-efi/ipxe.efi boot
diff --git a/debian/ipxe.postinst b/debian/grub-ipxe.postinst
similarity index 88%
rename from debian/ipxe.postinst
rename to debian/grub-ipxe.postinst
index 8594fe7..e77364b 100644
--- a/debian/ipxe.postinst
+++ b/debian/grub-ipxe.postinst
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
diff --git a/debian/ipxe.postrm b/debian/grub-ipxe.postrm
similarity index 88%
rename from debian/ipxe.postrm
rename to debian/grub-ipxe.postrm
index af8b09b..11d9924 100644
--- a/debian/ipxe.postrm
+++ b/debian/grub-ipxe.postrm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
@@ -7,7 +7,7 @@ case "$1" in
         command -v update-grub > /dev/null && update-grub || :
     ;;      
 esac
-    
+
 #DEBHELPER#
-        
+
 exit 0
diff --git a/debian/ipxe.install b/debian/ipxe.install
index dcb07fb..6a55ef7 100644
--- a/debian/ipxe.install
+++ b/debian/ipxe.install
@@ -1,8 +1,5 @@
-debian/tree/ipxe/* .
 src/bin-combined/ipxe.iso usr/lib/ipxe
-src/bin-i386-pcbios/ipxe.lkrn boot
 src/bin-i386-pcbios/ipxe.pxe usr/lib/ipxe
 src/bin-i386-pcbios/undionly.kkpxe usr/lib/ipxe
 src/bin-i386-pcbios/undionly.kpxe usr/lib/ipxe
-src/bin-x86_64-efi/ipxe.efi boot
 src/bin-x86_64-efi/snponly.efi usr/lib/ipxe
diff --git a/debian/patches/0005-strip-802.1Q-VLAN-0-priority-tags.patch b/debian/patches/0005-strip-802.1Q-VLAN-0-priority-tags.patch
new file mode 100644
index 0000000..d78a563
--- /dev/null
+++ b/debian/patches/0005-strip-802.1Q-VLAN-0-priority-tags.patch
@@ -0,0 +1,121 @@
+From: Ladi Prosek <[e-mail]>
+Subject: Strip 802.1Q VLAN 0 priority tags
+ iPXE was unable to receive priority tagged packets specified in
+ the 802.1Q standard and supported by all major networking stacks.
+ 
+ This commit adds a new function net_pull_tags which is called by
+ all consumers of incoming packets after stripping their link-layer
+ headers.
+Origin: vendor, https://git.centos.org/blob/rpms!ipxe.git/c7/SOURCES!0009-Strip-802.1Q-VLAN-0-priority-tags.patch
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1805920
+
+Index: ipxe-1.0.0+git-20180124.fbe8c52d/src/arch/x86/interface/pxe/pxe_undi.c
+===================================================================
+--- ipxe-1.0.0+git-20180124.fbe8c52d.orig/src/arch/x86/interface/pxe/pxe_undi.c	2018-11-30 22:42:34.000000000 -0500
++++ ipxe-1.0.0+git-20180124.fbe8c52d/src/arch/x86/interface/pxe/pxe_undi.c	2018-11-30 22:54:25.000000000 -0500
+@@ -976,6 +976,12 @@
+ 		}
+ 		ll_hlen = ( len - iob_len ( iobuf ) );
+ 
++		/* Strip link-layer-independent headers */
++		if ( ( rc = net_pull_tags ( iobuf, pxe_netdev, &net_proto ) ) != 0 ) {
++			/* Assume unknown net_proto */
++			net_proto = 0;
++		}
++
+ 		/* Determine network-layer protocol */
+ 		switch ( net_proto ) {
+ 		case htons ( ETH_P_IP ):
+Index: ipxe-1.0.0+git-20180124.fbe8c52d/src/include/ipxe/netdevice.h
+===================================================================
+--- ipxe-1.0.0+git-20180124.fbe8c52d.orig/src/include/ipxe/netdevice.h	2018-11-30 22:42:34.000000000 -0500
++++ ipxe-1.0.0+git-20180124.fbe8c52d/src/include/ipxe/netdevice.h	2018-11-30 22:54:25.000000000 -0500
+@@ -726,6 +726,8 @@
+ extern int net_rx ( struct io_buffer *iobuf, struct net_device *netdev,
+ 		    uint16_t net_proto, const void *ll_dest,
+ 		    const void *ll_source, unsigned int flags );
++extern int net_pull_tags ( struct io_buffer *iobuf, struct net_device *netdev,
++			   uint16_t *net_proto );
+ extern void net_poll ( void );
+ extern struct net_device_configurator *
+ find_netdev_configurator ( const char *name );
+Index: ipxe-1.0.0+git-20180124.fbe8c52d/src/interface/efi/efi_snp.c
+===================================================================
+--- ipxe-1.0.0+git-20180124.fbe8c52d.orig/src/interface/efi/efi_snp.c	2018-11-30 22:42:34.000000000 -0500
++++ ipxe-1.0.0+git-20180124.fbe8c52d/src/interface/efi/efi_snp.c	2018-11-30 22:54:25.000000000 -0500
+@@ -751,6 +751,13 @@
+ 		goto out_bad_ll_header;
+ 	}
+ 
++	/* Strip link-layer-independent headers */
++	if ( ( rc = net_pull_tags ( iobuf, snpdev->netdev, &iob_net_proto ) ) ) {
++		DBGC ( snpdev, "SNPDEV %p could not parse tags: %s\n",
++			snpdev, strerror ( rc ) );
++		goto out_bad_ll_header;
++	}
++
+ 	/* Return link-layer header parameters to caller, if required */
+ 	if ( ll_header_len )
+ 		*ll_header_len = ll_protocol->ll_header_len;
+Index: ipxe-1.0.0+git-20180124.fbe8c52d/src/net/netdevice.c
+===================================================================
+--- ipxe-1.0.0+git-20180124.fbe8c52d.orig/src/net/netdevice.c	2018-11-30 22:42:34.000000000 -0500
++++ ipxe-1.0.0+git-20180124.fbe8c52d/src/net/netdevice.c	2018-11-30 22:54:25.000000000 -0500
+@@ -1044,6 +1044,44 @@
+ }
+ 
+ /**
++ * Strip extra link-layer-independent tags from a received packet
++ *
++ * @v iobuf        I/O buffer
++ * @v netdev        Network device
++ * @v net_proto        Network-layer protocol, in network-byte order
++ * @ret rc        Return status code
++ *
++ * This function should be called after stripping link-layer headers but
++ * before inspecting the network-layer protocol.
++ */
++int net_pull_tags ( struct io_buffer *iobuf, struct net_device *netdev,
++            uint16_t *net_proto ) {
++    struct vlan_header *vlanhdr;
++    uint16_t tag;
++
++    /* Strip 802.1Q VLAN 0 priority tags if present */
++    while ( *net_proto == htons ( ETH_P_8021Q ) ) {
++        if ( iob_len ( iobuf ) < sizeof ( *vlanhdr ) ) {
++            DBG ( "VLAN header too short at %zd bytes (min %zd bytes)\n",
++                  iob_len ( iobuf ), sizeof ( *vlanhdr ) );
++            return -EINVAL;
++        }
++        vlanhdr = ( struct vlan_header * ) iobuf->data;
++        tag = VLAN_TAG ( ntohs ( vlanhdr->tci ) );
++
++        if ( tag == 0 && ! vlan_find ( netdev, tag ) ) {
++            /* VLAN 0, strip and continue */
++            *net_proto = vlanhdr->net_proto;
++            iob_pull ( iobuf, sizeof ( *vlanhdr ) );
++        } else {
++            /* Real VLAN tag, leave it alone */
++            break;
++        }
++    }
++    return 0;
++}
++
++/**
+  * Poll the network stack
+  *
+  * This polls all interfaces for received packets, and processes
+@@ -1093,6 +1131,12 @@
+ 				free_iob ( iobuf );
+ 				continue;
+ 			}
++
++			/* Remove link-layer-independent headers */
++			if ( ( rc = net_pull_tags ( iobuf, netdev, &net_proto ) ) ) {
++				free_iob ( iobuf );
++				continue;
++			}
+ 
+ 			/* Hand packet to network layer */
+ 			if ( ( rc = net_rx ( iob_disown ( iobuf ), netdev,
diff --git a/debian/patches/handle-dhcp-nack.patch b/debian/patches/handle-dhcp-nack.patch
new file mode 100644
index 0000000..65aa37e
--- /dev/null
+++ b/debian/patches/handle-dhcp-nack.patch
@@ -0,0 +1,43 @@
+Description: iPXE fails to handle DHCPNACK's
+ iPXE does not handle DHCPNACK's. If iPXE gets a DHCPNACK it will
+ not re-attempt to DHCPDISCOVER, which causes iPXE to fail to PXE
+ boot on situations where there are multiple DHCP servers are
+ offering an IP.
+Author: Blake Rouse <[e-mail]>
+Forwarded: https://github.com/ipxe/ipxe/pull/66
+Bug: https://bugs.launchpad.net/bugs/1707999
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipxe/+bug/1707999
+
+Index: ipxe-1.0.0+git-20161027.b991c67+really20150424.a25a16d/src/net/udp/dhcp.c
+===================================================================
+--- ipxe-1.0.0+git-20161027.b991c67+really20150424.a25a16d.orig/src/net/udp/dhcp.c	2017-10-12 16:38:21.527631622 -0400
++++ ipxe-1.0.0+git-20161027.b991c67+really20150424.a25a16d/src/net/udp/dhcp.c	2017-10-12 16:38:21.523631288 -0400
+@@ -523,9 +523,18 @@
+ 		DBGC ( dhcp, " for %s", inet_ntoa ( ip ) );
+ 	DBGC ( dhcp, "\n" );
+ 
+-	/* Filter out unacceptable responses */
++	/* Filter out invalid port */
+ 	if ( peer->sin_port != htons ( BOOTPS_PORT ) )
+ 		return;
++
++	/* Handle DHCPNAK */
++	if ( msgtype /* BOOTP */ && ( msgtype == DHCPNAK ) ) {
++		/* Go back to discover, again. */
++		dhcp_set_state ( dhcp, &dhcp_state_discover );
++		return;
++	}
++
++	/* Filter out unacceptable responses */
+ 	if ( msgtype /* BOOTP */ && ( msgtype != DHCPACK ) )
+ 		return;
+ 	if ( server_id.s_addr != dhcp->server.s_addr )
+@@ -907,7 +916,7 @@
+ 	/* Initialise DHCP packet structure */
+ 	memset ( dhcppkt, 0, sizeof ( *dhcppkt ) );
+ 	dhcppkt_init ( dhcppkt, data, max_len );
+-	
++
+ 	/* Set DHCP_MESSAGE_TYPE option */
+ 	if ( ( rc = dhcppkt_store ( dhcppkt, DHCP_MESSAGE_TYPE,
+ 				    &msgtype, sizeof ( msgtype ) ) ) != 0 )
diff --git a/debian/patches/series b/debian/patches/series
index 7bb8252..f422ac7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 debian-changes
+handle-dhcp-nack.patch
+0005-strip-802.1Q-VLAN-0-priority-tags.patch
diff --git a/debian/rules b/debian/rules
index fe43fdf..c2d4f10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,33 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 override_dh_auto_configure:
 	cp debian/config/* src/config/local
 
+# qemu EFI roms shall be built with CONFIG=qemu
+# This will make it select src/config/qemu/* as config base
+# and set -DCONFIG=qemu -DLOCAL_CONFIG=qemu
+src/bin-i386-pcbios/%.rom src/bin-x86_64-efi/%.efirom: export CONFIG=qemu
+# qemu EFI roms are built without HTTPS, EFI does that on its own (and better)
+src/bin-x86_64-efi/%.efirom: export NOHTTPS=true
+
 src/bin-i386-pcbios/% src/bin-x86_64-efi/%:
+	# clean and reconfigure if either NOHTTPS or CONFIG=qemu switches
+	if [ "config:$(CONFIG)nohttps:$(NOHTTPS)" != "$(shell cat debian/last-used-config 2>/dev/null)" ]; then \
+	    if [ "$(NOHTTPS)" = "true" ]; then \
+	        cp -v debian/config/* src/config/local; \
+	    else \
+	        echo "#define DOWNLOAD_PROTO_HTTPS" >> src/config/local/general.h; \
+	    fi; \
+	   $(MAKE) -C src clean; \
+	   echo -n "config:$(CONFIG)" > debian/last-used-config; \
+	   echo -n "nohttps:$(NOHTTPS)" >> debian/last-used-config; \
+	fi;
 	dh_auto_build --sourcedirectory=src -- V=1 NO_WERROR=1 VERSION="$(VERSION)" $(subst src/,,$@)
 
 src/bin-combined/%.efirom: src/bin-i386-pcbios/%.rom src/bin-x86_64-efi/%.efirom
 	@[ -d $(dir $@) ] || mkdir $(dir $@)
 	src/util/catrom.pl $^ > $@
+	# efi roms are >256k since Bionic due to https + natural growth
+	# stay at 256k-512k after disabling https in efi via padding
+	src/util/padimg.pl --blksize=524288 --byte=0xff --verbose $@
 
 src/bin-combined/%.iso: src/bin-i386-pcbios/%.lkrn src/bin-x86_64-efi/%.efi
 	@[ -d $(dir $@) ] || mkdir $(dir $@)
@@ -29,10 +50,15 @@ src/bin-combined/%.iso: src/bin-i386-pcbios/%.lkrn src/bin-x86_64-efi/%.efi
 
 override_dh_auto_build: $(shell grep -hoE 'src/bin(-[^/]*)?/\S+' debian/*.install)
 
+override_dh_install:
+	dh_install
+	debian/util/check-rom-sizes
+
 override_dh_auto_clean:
 	$(MAKE) -C src veryclean
+	rm -f debian/last-used-config
 	rm -fr src/bin*
-	rm -f src/config/local/*
+	rm -fr src/config/local/*
 
 .NOTPARALLEL:
 .SECONDARY:
diff --git a/debian/tree/ipxe/etc/grub.d/20_ipxe b/debian/tree/ipxe/etc/grub.d/20_ipxe
index 8be37c8..fc77dfd 100755
--- a/debian/tree/ipxe/etc/grub.d/20_ipxe
+++ b/debian/tree/ipxe/etc/grub.d/20_ipxe
@@ -15,11 +15,24 @@ IPXE=/boot/ipxe.lkrn
 
 if test -e "$IPXE" ; then
   IPXEPATH=$( make_system_path_relative_to_its_root "$IPXE" )
+  # Remove the .lkrn extension
+  IPXEPATH=${IPXEPATH%.lkrn}
   echo "Found iPXE image: $IPXE" >&2
   cat << EOF
-menuentry "Network boot (iPXE)" --users "" --class network {
+menuentry "Network boot (iPXE)" --users "" --class network --id ipxe {
 ${prepare_boot_cache}
-	linux16 $IPXEPATH
+EOF
+  save_default_entry | grub_add_tab
+  cat << EOF
+	if [ "\$grub_platform" = "efi" ]; then
+		chainloader $IPXEPATH.efi
+	else
+		linux16 $IPXEPATH.lkrn
+		# If the user provided an iPXE script, load it
+		if [ -f $IPXEPATH.ipxe ]; then
+			initrd16 $IPXEPATH.ipxe
+		fi
+	fi
 }
 EOF
 fi
diff --git a/debian/util/check-rom-sizes b/debian/util/check-rom-sizes
new file mode 100755
index 0000000..cde9f94
--- /dev/null
+++ b/debian/util/check-rom-sizes
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# Generate a isolinux/bios and efi ISO boot image
+
+set -e
+PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+dir="./debian/ipxe-qemu/usr/lib/ipxe/qemu/"
+rc=0
+
+declare -A roms
+# these are the current power-of-2 buckets of roms generated by ipxe
+# If any of these roms grows/shrinks out of its bucket a KVM
+# live migration between two systems with those different sizes will fail.
+# This check is intended to break builds on such a change to make it an opt-in
+# change by a developer (to change the sizes below AFTER he has taken care that
+# the qemu/libvirt on the migration paths will take care of it on migration).
+# Due to ipxe (currently) not being part of Ubuntu Cloud Archive all UCA have
+# the ipxe of the latest LTS. Which makes a certain qemu version (which defines
+# the machine type) ambiguous which ipxe roms it has.
+# Therefore such size breaking upgrades are only reasonably doable on LTS
+# releases where qemu can assume all former types are of the former size
+# and can handle all of these as one.
+roms["efi-e1000.rom"]="524288"
+roms["efi-e1000e.rom"]="524288"
+roms["efi-eepro100.rom"]="524288"
+roms["efi-ne2k_pci.rom"]="524288"
+roms["efi-pcnet.rom"]="524288"
+roms["efi-rtl8139.rom"]="524288"
+roms["efi-virtio.rom"]="524288"
+roms["efi-vmxnet3.rom"]="524288"
+roms["pxe-e1000.rom"]="131072"
+roms["pxe-e1000e.rom"]="131072"
+roms["pxe-eepro100.rom"]="131072"
+roms["pxe-ne2k_pci.rom"]="131072"
+roms["pxe-pcnet.rom"]="131072"
+roms["pxe-rtl8139.rom"]="131072"
+roms["pxe-virtio.rom"]="131072"
+roms["pxe-vmxnet3.rom"]="131072"
+
+echo "Generated roms:"
+ls -laF "${dir}"
+
+for rom in "${!roms[@]}"; do
+    size=$(stat --printf="%s" "${dir}/${rom}")
+    shiftsize="${size}"
+    bucket=1
+    while [ "${shiftsize}" -ne "1" ]; do
+        shiftsize=$((shiftsize>>1))
+        bucket=$((bucket<<1))
+    done
+    bucket=$((bucket<<1))
+    # being smaller could be ok, but check -eq to warn/break on unexpected size loss as well
+    if [ "${size}" -eq "${roms[$rom]}" ]; then
+        echo "OK: ${rom} is exactly ${size} bytes as expected"
+    else
+        if [ "${bucket}" -eq "${roms[$rom]}" ]; then
+            echo "OK: ${rom} is ${size} bytes and thereby in bucket ${bucket} which matches ${roms[$rom]}"
+        else
+            echo "ERROR: ${rom} is ${size} bytes and thereby in bucket ${bucket} which does not match ${roms[$rom]}"
+            rc=1
+        fi
+    fi
+done
+
+exit ${rc}