~paelzer/ubuntu/+source/ipxe:merge-upstream-disco

Last commit made on 2019-01-09
Get this branch:
git clone -b merge-upstream-disco https://git.launchpad.net/~paelzer/ubuntu/+source/ipxe
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
merge-upstream-disco
Repository:
lp:~paelzer/ubuntu/+source/ipxe

Recent commits

06a0b97... by Christian Ehrhardt 

changelog: merge latest upstream 1.0.0+git-20190109.133f4c4

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

2f36852... by Christian Ehrhardt 

drop fix to handle R_X86_64_PLT32 relocations (upstream)

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

2d01f36... by Christian Ehrhardt 

new upstream release 1.0.0+git-20190109.133f4c4

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

671f316... by Andres Rodriguez

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu5 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Changelog parent: e0bcbbf3e69e789458aa7e98ed9cabde01d8c6cc

New changelog entries:
  * 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)

e0bcbbf... by Julian Andres Klode

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu4 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 6644bad73849a3c4b83be26eb631db0669351ce2

New changelog entries:
  * Build ROMs for QEMU with CONFIG=qemu (LP: #1789319)

6644bad... by Julian Andres Klode

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu3 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 59fb9a7fd3444341a97bcfb4dc6208d4114d395f

New changelog entries:
  * debian/patches/fix-elf2efi-plt-relocation.diff: Cherry-pick fix from
    ipxe devel mailing list to handle R_X86_64_PLT32 relocations.

59fb9a7... by Christian Ehrhardt 

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu2 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: b17feec1a196c8e9d05bfb1cb91fefb3afcac59b

New changelog entries:
  * debian/copyright: update copyright information to satisfy lintian
    dep5 checks (LP: #1747071)
  * d/p/enable-https.patch: adding proper dep3 header

b17feec... by Christian Ehrhardt 

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu1 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 0a531d410cc0cc68d7fc1f8b5ca784cdc82603ab

New changelog entries:
  * 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

0a531d4... by Andres Rodriguez

Import patches-unapplied version 1.0.0+git-20161027.b991c67+really20150424.a25a16d-1ubuntu2 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 1aece610aeebb2efc502cf73ecadaf5bd96d35b2

New changelog entries:
  * debian/patches/handle-dhcp-nack.patch: Handle DHCP NAK and send a
    re-discover. (LP: #1707999)

1aece61... by Christian Ehrhardt 

Import patches-unapplied version 1.0.0+git-20161027.b991c67+really20150424.a25a16d-1ubuntu1 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 2f4f0d2b25acbd9c0a8fb73605cb68fb3332c05d
Upload parent: 83df45bdd6840d714b2e37bcb87f2aadb6b8b369

New changelog entries:
  * 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.