Ubuntu
ipxe package

Merge ~paelzer/ubuntu/+source/ipxe:add-e100e-rom into ubuntu/+source/ipxe:ubuntu/disco-devel

  1. Git
  2. lp:~paelzer/ubuntu/+source/ipxe
  3. add-e100e-rom
  4. Merge into ubuntu/disco-devel
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Andreas Hasenack
Approved revision: fe9eed764b3010fe4869eae3535a8211113f84ea
Merge reported by: Christian Ehrhardt 
Merged at revision: fe9eed764b3010fe4869eae3535a8211113f84ea
Proposed branch: ~paelzer/ubuntu/+source/ipxe:add-e100e-rom
Merge into: ubuntu/+source/ipxe:ubuntu/disco-devel
Diff against target: 49 lines (+12/-0)
3 files modified
debian/changelog (+8/-0)
debian/ipxe-qemu.install (+2/-0)
debian/util/check-rom-sizes (+2/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+363376@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1

I thought "closes: #xxxxxx" had to start with a capital C :)

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

tagged, uploaded and waiting migration - thanks for the review

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 2e1c9ef..c11bbfa 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+ipxe (1.0.0+git-20190109.133f4c4-0ubuntu2) disco; urgency=medium
7+
8+ * Add e1000e firmware for qemu. (closes: #884240)
9+ - d/ipxe-qemu.install: install new rom
10+ - d/util/check-rom-sizes: check new rom
11+
12+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 19 Feb 2019 17:17:04 +0100
13+
14 ipxe (1.0.0+git-20190109.133f4c4-0ubuntu1) disco; urgency=medium
15
16 * Merge new upstream release 1.0.0+git-20190109.133f4c4
17diff --git a/debian/ipxe-qemu.install b/debian/ipxe-qemu.install
18index fb32daf..a1a0ec9 100755
19--- a/debian/ipxe-qemu.install
20+++ b/debian/ipxe-qemu.install
21@@ -3,6 +3,8 @@ src/bin-efi/82540em.efirom => usr/lib/ipxe/qemu/efi-e1000.rom
22 src/bin/82540em.rom => usr/lib/ipxe/qemu/pxe-e1000.rom
23 src/bin-efi/eepro100.efirom => usr/lib/ipxe/qemu/efi-eepro100.rom
24 src/bin/eepro100.rom => usr/lib/ipxe/qemu/pxe-eepro100.rom
25+src/bin-efi/808610d3.efirom => usr/lib/ipxe/qemu/efi-e1000e.rom
26+src/bin/808610d3.rom => usr/lib/ipxe/qemu/pxe-e1000e.rom
27 src/bin-efi/ns8390.efirom => usr/lib/ipxe/qemu/efi-ne2k_pci.rom
28 src/bin/ns8390.rom => usr/lib/ipxe/qemu/pxe-ne2k_pci.rom
29 src/bin-efi/pcnet32.efirom => usr/lib/ipxe/qemu/efi-pcnet.rom
30diff --git a/debian/util/check-rom-sizes b/debian/util/check-rom-sizes
31index 03cf71d..31664d1 100755
32--- a/debian/util/check-rom-sizes
33+++ b/debian/util/check-rom-sizes
34@@ -22,6 +22,7 @@ declare -A roms
35 # releases where qemu can assume all former types are of the former size
36 # and can handle all of these as one.
37 roms["efi-e1000.rom"]="524288"
38+roms["efi-e1000e.rom"]="524288"
39 roms["efi-eepro100.rom"]="524288"
40 roms["efi-ne2k_pci.rom"]="524288"
41 roms["efi-pcnet.rom"]="524288"
42@@ -29,6 +30,7 @@ roms["efi-rtl8139.rom"]="524288"
43 roms["efi-virtio.rom"]="524288"
44 roms["efi-vmxnet3.rom"]="524288"
45 roms["pxe-e1000.rom"]="131072"
46+roms["pxe-e1000e.rom"]="131072"
47 roms["pxe-eepro100.rom"]="131072"
48 roms["pxe-ne2k_isa.rom"]="131072"
49 roms["pxe-ne2k_pci.rom"]="131072"

Subscribers

People subscribed via source and target branches