Merge ~jj/ubuntu/+source/ipxe:lp2126002-merge-resolute into ubuntu/+source/ipxe:debian/sid

[Jonas Jelten]

bug #2126002
ppa: https://launchpad.net/~jj/+archive/ubuntu/lp2126002-ipxe-merge-resolute

[Lena Voytek (lvoytek)]

LGTM! range-diff looks good, changelog looks good overall, and delta commit messages are even better now. The version number just needs to be updated to remove ~ppa1 then it will be good to go

review: Needs Fixing

[Jonas Jelten (jj)]

thx! should be fixed now.

[Lena Voytek (lvoytek)]

Sweet, sponsored!

dput ubuntu ../ipxe_1.21.1+git-20250829.969ce2c55+dfsg-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ipxe_1.21.1+git-20250829.969ce2c55+dfsg-1ubuntu1.dsc: done.
  Uploading ipxe_1.21.1+git-20250829.969ce2c55+dfsg.orig.tar.xz: done.
  Uploading ipxe_1.21.1+git-20250829.969ce2c55+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading ipxe_1.21.1+git-20250829.969ce2c55+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading ipxe_1.21.1+git-20250829.969ce2c55+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lvoytek, jj
Uploaders: lvoytek
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 2c245e6..1a1ee51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+ipxe (1.21.1+git-20250829.969ce2c55+dfsg-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2126002). Remaining changes:
+    - d/t/control: skip-not-installable rom-* tests (LP #1677874)
+    - d/rules: don't build with lto (as recommended by upstream)
+      https://github.com/ipxe/ipxe/issues/1515
+    - d/p/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets: remove due to upstream request
+      (LP #2121439)
+    - d/rules: pad size of generated roms to 512KiB
+  * Dropped changes:
+    - d/watch: use format $version+git-$date-$hash
+      [fixed in 1.21.1+git-20250829.969ce2c55+dfsg-1]
+    - d/p/debian/patches/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets.patch:
+      fix HOST_CFLAGS recursion to avoid make error
+      "Recursive variable `HOST_CFLAGS' references itself"
+      [obsolete due to patch removal]
+
+ -- Jonas Jelten <[e-mail]>  Fri, 05 Dec 2025 14:46:47 +0100
+
 ipxe (1.21.1+git-20250829.969ce2c55+dfsg-1) unstable; urgency=medium
 
   [ Miao Wang ]
@@ -13,6 +32,79 @@ ipxe (1.21.1+git-20250829.969ce2c55+dfsg-1) unstable; urgency=medium
 
  -- Shengqi Chen <[e-mail]>  Wed, 17 Sep 2025 17:02:14 +0800
 
+ipxe (1.21.1+git-20250602.5b3ebf8b+dfsg-1ubuntu3) questing; urgency=medium
+
+  * d/t/control: skip-not-installable rom-* tests (LP: #1677874)
+
+ -- Lukas Märdian <[e-mail]>  Mon, 29 Sep 2025 11:45:57 +0200
+
+ipxe (1.21.1+git-20250602.5b3ebf8b+dfsg-1ubuntu2) questing; urgency=medium
+
+  * d/p/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets: removed due to upstream
+    request (LP: #2121439)
+
+ -- Jonas Jelten <[e-mail]>  Wed, 10 Sep 2025 12:10:47 +0200
+
+ipxe (1.21.1+git-20250602.5b3ebf8b+dfsg-1ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #1996530). Changed version from debian's
+    1.21.1+git20250602.5b3ebf8b+dfsg-1 by including '+git-', which is needed
+    to be newer than Ubuntu's latest 1.21.1+git-20220113.fbbdc3926-0ubuntu2
+    and newer than Debian's 1.21.1+git20250602.5b3ebf8b+dfsg-1 (using '+git')
+
+    Remaining changes:
+    - d/util/check-rom-sizes, d/rules: pad size of generated roms to 512KiB
+      to avoid accidentally breaking KVM live migration on updates/fixes.
+      debian managed to reduce the size back to 256KiB in
+      1.21.1+git20250317.42a29d56+dfsg-1
+      but to be future-proof, let's reserve this little extra space.
+      background: qemu migrations apparently reserve memory from the target
+      system's roms, while moving the data from the source emulator.
+  * Drop changes:
+    - Fix FTBFS with new binutils
+      + d/p/0003-Inhibit-linker-warnings-about-an-implied-executable-.patch
+      [upstream in e17568ad0642490143d0c6b154c874b9b9e285bf]
+      + d/p/0004-Fix-building-with-newer-binutils.patch
+      [upstream in 6ca597eee9f95b846a3c2dc1231e63cfc02272c1]
+    - d/p/handle-dhcp-nack.patch: Handle DHCP NAK and send a re-discover.
+      (LP #1707999)
+      [upstream in 1192edf394aaebde666c6aafda1c8b782b08a845]
+    - d/p/build-Be-explicit-about-fcommon-compiler-directive.patch
+      [upstream in 1.21.0 f982a712979619dbae2c6e0d741757e2ce94be11]
+    - d/p/lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch
+      (LP #1882671)
+      [upstream in 1.21.0 2ae5d4338661b65c63eb5cb1a96e5b803fe7d620]
+    - split grub integration from ipxe->grub-ipxe
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-3]
+    - d/grub-ipxe.install, d/control, d/rules: Build ipxe-arm64.efi
+      (LP #1890230)
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-3]
+    - d/rules: build ROMs for QEMU with CONFIG=qemu
+      (LP #1789319)
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-2]
+    - d/tree/ipxe/etc/grub.d/20_ipxe: Make grub-ipxe work under UEFI
+      (LP #1811496)
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-2]
+    - d/rules: don't clean explicitly in between builds
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-2]
+    - d/util/geniso: fix rounding to unbreak iso creation
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-1]
+    - d/copyright updates (LP #1747071)
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-1]
+    - d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch
+      [included in 1.21.1+git20220113.fbbdc3926+dfsg-1]
+  * New changes:
+    - d/watch: use format $version+git-$date-$hash
+      to ensure version continuity, since debian switched to
+      $version+git$date-$hash which is lower than -
+    - d/p/debian/patches/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets.patch:
+      fix HOST_CFLAGS recursion to avoid make error
+      "Recursive variable `HOST_CFLAGS' references itself"
+    - d/rules: don't build with lto (as recommended by upstream)
+      https://github.com/ipxe/ipxe/issues/1515
+
+ -- Jonas Jelten <[e-mail]>  Wed, 13 Aug 2025 12:18:36 +0200
+
 ipxe (1.21.1+git20250602.5b3ebf8b+dfsg-1) unstable; urgency=medium
 
   * New upstream version 1.21.1+git20250602.5b3ebf8b+dfsg
@@ -267,6 +359,37 @@ ipxe (1.21.1+git20220113.fbbdc3926+dfsg-1) unstable; urgency=medium
 
  -- Sven Geuer <[e-mail]>  Fri, 27 Dec 2024 12:38:06 +0100
 
+ipxe (1.21.1+git-20220113.fbbdc3926-0ubuntu2) noble; urgency=medium
+
+  * Fix FTBFS with new binutils.
+    - d/p/0003-Inhibit-linker-warnings-about-an-implied-executable-.patch
+    - d/p/0004-Fix-building-with-newer-binutils.patch
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 16 Apr 2024 17:17:04 -0400
+
+ipxe (1.21.1+git-20220113.fbbdc3926-0ubuntu1) jammy; urgency=medium
+
+  * Bump code to 1.21.1+git-20220113.fbbdc3926
+  * d/grub-ipxe.install, d/control, d/rules: Build ipxe-arm64.efi
+    (LP: #1890230)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 13 Jan 2022 14:53:40 +0100
+
+ipxe (1.21.1+git-20210429.323af9ee-0ubuntu1) impish; urgency=medium
+
+  * Bump code to 1.21.1+git-20210429.323af9ee
+    - Drop d/p/handle-dhcp-nack.patch: Handle DHCP NAK and send a
+      re-discover. (LP 1707999)
+      [replaced by 1192edf "Handle DHCPNAK by returning to discovery state"]
+    - Drop d/p/lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch
+      [upstream in 1.21.0]
+    - Drop d/p/build-Be-explicit-about-fcommon-compiler-directive.patch
+      [upstream in 1.21.0]
+    - update d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch to match 1.21
+    - d/rules: don't clean explicitly in between builds
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 29 Apr 2021 16:12:33 +0200
+
 ipxe (1.0.0+git-20190125.36a4c85-5.2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -282,6 +405,86 @@ ipxe (1.0.0+git-20190125.36a4c85-5.1) unstable; urgency=medium
 
  -- Chris Hofstaedtler <[e-mail]>  Sun, 07 Feb 2021 17:25:50 +0000
 
+ipxe (1.0.0+git-20190125.36a4c85-5ubuntu4) hirsute; urgency=medium
+
+  * d/u/geniso: fix rounding to unbreak iso creation
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 30 Mar 2021 10:09:06 +0200
+
+ipxe (1.0.0+git-20190125.36a4c85-5ubuntu3) groovy; urgency=medium
+
+  * d/p/build-Be-explicit-about-fcommon-compiler-directive.patch: fix
+    FTBFS with gcc-10
+  * d/util/geniso: fix FTBFS due to rounding issues
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 01 Oct 2020 10:14:14 +0200
+
+ipxe (1.0.0+git-20190125.36a4c85-5ubuntu2) groovy; urgency=medium
+
+  * d/p/lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch: fix the
+    formerly avoided efi TPL issues (LP: #1882671)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 16 Jul 2020 14:36:54 +0200
+
+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)
@@ -316,6 +519,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)
@@ -323,6 +699,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.
@@ -337,6 +731,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.
@@ -351,12 +774,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.
@@ -375,6 +836,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)
@@ -403,6 +879,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.
@@ -423,3 +1009,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 c3214ea..e5d489b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ipxe
 Section: admin
 Priority: optional
-Maintainer: Miao Wang <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Miao Wang <[e-mail]>
 Uploaders: Shengqi Chen <[e-mail]>
 Build-Depends:
     debhelper-compat (= 13),
diff --git a/debian/patches/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets.patch b/debian/patches/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets.patch
deleted file mode 100644
index cece5ce..0000000
--- a/debian/patches/respect-CPPFLAGS-CFLAGS-LDFLAGS-presets.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Incorporate preset CPPFLAGS, CFLAGS and LDFLAGS where missing.
- blhc complains about missing CPPFLAGS and CFLAGS in general and about missing
- LDFLAGS when building binaries from src/util. This patch soothes blhc.
-Author: Sven Geuer <[e-mail]>
-Forwarded: not-needed
-Last-Update: 2024-12-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -4,10 +4,10 @@
- #
- 
- CLEANUP		:=
--CFLAGS		:=
-+CFLAGS		:= $(CPPFLAGS) $(CFLAGS)
-+HOST_CFLAGS	?= $(HOST_CFLAGS)
- ASFLAGS		:=
- LDFLAGS		:=
--HOST_CFLAGS	:=
- MAKEDEPS	:= Makefile
- CROSS_COMPILE	?= $(CROSS)
- SYMBOL_PREFIX	:=
diff --git a/debian/patches/series b/debian/patches/series
index 4116f72..24dcaf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 config-local.patch
-respect-CPPFLAGS-CFLAGS-LDFLAGS-presets.patch
 strip-802.1Q-VLAN-0-priority-tags.patch
 reduce_efirom_size.patch
diff --git a/debian/rules b/debian/rules
index af8ecd7..e279d56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 
 #export DH_VERBOSE=1
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
@@ -98,7 +98,7 @@ define run-catrom =
 done
 src/util/catrom.pl $^ > $@
 @echo "Size before padding: $$(stat -c %s $@)"
-src/util/padimg.pl --blksize=262144 --byte=0xff --verbose $@
+src/util/padimg.pl --blksize=524288 --byte=0xff --verbose $@
 endef
 
 src/bin-combined/%.efirom: src/bin-i386-pcbios-rom/%.rom src/bin-x86_64-efi-rom/%.efirom
diff --git a/debian/tests/control b/debian/tests/control
index 718bc34..cb24c52 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -51,80 +51,96 @@ Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 Test-Command: ./debian/tests/ipxe-rom i386 e1000
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-e1000
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 e1000e
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-e1000e
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 rtl8139
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-rtl8139
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 virtio
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-virtio
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 vmxnet3
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-vmxnet3
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 eepro100
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-eepro100
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 ne2k_pci
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-ne2k_pci
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom i386 pcnet
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64 [amd64 arm64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64], qemu-system-i386 [armel armhf i386], seabios, debian-installer-13-netboot-amd64,
 Features: test-name=rom-i386-pcnet
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64,armel,armhf,i386
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 e1000
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-e1000
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 e1000e
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-e1000e
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 rtl8139
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-rtl8139
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 virtio
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-virtio
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 vmxnet3
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-vmxnet3
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 eepro100
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-eepro100
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 ne2k_pci
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-ne2k_pci
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
 Test-Command: ./debian/tests/ipxe-rom x86_64 pcnet
 Depends: ipxe-qemu, expect, xxd, qemu-system-amd64, ovmf, debian-installer-13-netboot-amd64,
 Features: test-name=rom-x86_64-pcnet
+Restrictions: skip-not-installable
 Architecture: amd64,arm64,loong64,mips64el,ppc64,ppc64el,riscv64,s390x,sparc64
 
diff --git a/debian/util/check-rom-sizes b/debian/util/check-rom-sizes
index b426f1a..0c3ee35 100755
--- a/debian/util/check-rom-sizes
+++ b/debian/util/check-rom-sizes
@@ -21,14 +21,14 @@ declare -A roms
 # 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"]="262144"
-roms["efi-e1000e.rom"]="262144"
-roms["efi-eepro100.rom"]="262144"
-roms["efi-ne2k_pci.rom"]="262144"
-roms["efi-pcnet.rom"]="262144"
-roms["efi-rtl8139.rom"]="262144"
-roms["efi-virtio.rom"]="262144"
-roms["efi-vmxnet3.rom"]="262144"
+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"