Code review comment for ~paelzer/ubuntu/+source/ipxe:merge-ipxe-groovy-36a4c85-5

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

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 understanding that if anyone needs to track down things I have pushed tags as usual:
lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3
lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v1
lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v2
lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v3
lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v4
lp1884758/logical/1.0.0+git-20190109.133f4c4-0ubuntu3-v5
lp1884758/new/debian
lp1884758/old/debian
lp1884758/old/ubuntu
lp1884758/reconstruct/1.0.0+git-20190109.133f4c4-0ubuntu3
lp1884758/split/1.0.0+git-20190109.133f4c4-0ubuntu3

I'll start some general regression tests against this now, but I also want to do something explicit for EFI before this is uploaded.

« Back to merge proposal