ubuntu/+source/ipxe:applied/ubuntu/impish-devel

Last commit made on 2021-06-02
Get this branch:
git clone -b applied/ubuntu/impish-devel https://git.launchpad.net/ubuntu/+source/ipxe
Members of git-ubuntu import can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/impish-devel
Repository:
lp:ubuntu/+source/ipxe

Recent commits

79f9a82... by Christian Ehrhardt 

1.21.1+git-20210429.323af9ee-0ubuntu1 (patches applied)

Imported using git-ubuntu import.

82d916e... by Christian Ehrhardt 

Strip 802.1Q VLAN 0 priority tags

Gbp-Pq: 0005-strip-802.1Q-VLAN-0-priority-tags.patch.

d581a14... by Christian Ehrhardt 

debian-changes

No DEP3 Subject or Description header found

Gbp-Pq: debian-changes.

4d3eeea... by Christian Ehrhardt 

update d/copyright

Update for added/moved files as well as clarifying some more in detail.

In some cases the license checkers detects a different version (before
my change as well), but upstream has declared licenses explicitly in
those files via the FILE_LICENCE and that overrules the detected text.

If one decides that the base text >> explicit declaration the new rules
will still help as they provide more granularity.

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

107d029... by Christian Ehrhardt 

changelog: 1.21.1+git-20210429.323af9ee-0ubuntu1

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

0695556... by Christian Ehrhardt 

d/rules: don't clean explicitly in between builds

The new upstream clean target now cleans the actual roms which we build
many of (4 builds creating 22 blobs) and thereby break the latter re-use
of those for combined roms or the .install handling.

I thought about using proper --builddirectory with one for each build,
but the build system doesn't support that and it is a lot of delta for
something that then still needs plenty of crude workarounds.

Other manual redirections like using a built-artifacts directory "in d/rules"
to save the roms to after build needs plenty of delta for all the special
cases classic/efi, normal/combined, ...

Due to that I instead chose to just retain the built "in place" by ommitting
the make clean. The build itself still is done as the include files in
src/config/local let it rebuild.

Once this is upstreamed to Debian it can be unified using e.g. extra build
directories without hard-to-maintain delta.

Maintenance Note: can be squashed with the delta that introduced this
snippet which is "d/rules: only enable https on non EFI roms."

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

ee2d226... by Christian Ehrhardt 

update d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch to match 1.21

This was added in
  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)

Since then upstream has made vlan_find static via
 https://github.com/ipxe/ipxe/commit/fe680c8228563369804948010954128aacb7db74
To further be usable, parts of the refered patch need to be reverted
and made part of the Ubuntu Delta.

Note: This can be squashed with adding of the patch on next merge.

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

7b112ec... by Christian Ehrhardt 

Drop d/p/build-Be-explicit-about-fcommon-compiler-directive.patch [upstream in 1.21.0]

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

336829d... by Christian Ehrhardt 

Drop lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch [upstream in 1.21.0]

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

3d8a626... by Christian Ehrhardt 

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"

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