ubuntu/+source/ipxe:ubuntu/hirsute-proposed

Last commit made on 2021-03-30
Get this branch:
git clone -b ubuntu/hirsute-proposed 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:
ubuntu/hirsute-proposed
Repository:
lp:ubuntu/+source/ipxe

Recent commits

ea1e387... by Christian Ehrhardt 

changelog: fix rounding to unbreak iso creation

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

0b4b3b6... by Christian Ehrhardt 

d/u/geniso: fix rounding to unbreak iso creation

In certain cases (e.g. toolchain changes) the size of the created EFI
blob can end up triggering a rounding down which breaks the build.
Example:
  debian/util/geniso src/bin-combined/ipxe.iso src/bin-i386-pcbios/ipxe.lkrn \
    src/bin-x86_64-efi/ipxe.efi
  ...
  ++ stat -c %s src/bin-x86_64-efi/ipxe.efi
  + blocks=896
  + mkfs.msdos -C src/bin-combined/iso.dir.uayAjK/efi.img 896
  + mmd -i src/bin-combined/iso.dir.uayAjK/efi.img ::efi
  + mmd -i src/bin-combined/iso.dir.uayAjK/efi.img ::efi/boot
  + mcopy -o -i src/bin-combined/iso.dir.uayAjK/efi.img \
      src/bin-x86_64-efi/ipxe.efi ::efi/boot/bootx64.efi
  Disk full

This is due to:
  echo $(($(stat -c %s "$EFI") / 1024))
  872
  echo $(($(stat -c %s "$EFI") / 1024 + 55))
  927
  echo $(((($(stat -c %s "$EFI") / 1024 + 55)/32*32)))
  896 <- Rounds DOWN

This is due to size+55 => 927 being "just below" the next 32 iteration
which would be at 928. In many cases that works fine (I don't know how
the +55 was invented, I guess that is for headers). But in some cases
it caps too much eventually ending up in a too small image file.

Rounding up (in bash) usually is "N+1/divisor". Therefore if add +1 before
the rounding for 32 we'd avoid the issue.

I compared the resulting ISO size with former builds and it was still
well within the range of past builds (869,947,948 - now 884).

In Ubuntu we already had
 https://git.launchpad.net/ubuntu/+source/ipxe/commit/?id=cd9c3f19ab148e5
But while working in some it falls short in other cases. So this can be
considered the improved version of the former and squashed on the next
merge. Submitted to Debian as:
https://salsa.debian.org/waldi/ipxe/-/merge_requests/2

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

4c53c7d... by Christian Ehrhardt 

changelog: fix FTBFS due to rounding issues

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

cd9c3f1... by Christian Ehrhardt 

d/util/geniso: fix FTBFS due to rounding issues

In some cases there can be rounding issues on the efi content to image
size. In those cases the build will fail with the image not being big
enough.
$ debian/util/geniso src/bin-combined/ipxe.iso src/bin-i386-pcbios/ipxe.lkrn \
  src/bin-x86_64-efi/ipxe.efi
  Disk full

Avoid this size-off-by-one by adding 1 block to the requested size.

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

877e9dc... by Christian Ehrhardt 

changelog: fix FTBFS with gcc-10

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

b1926df... by Christian Ehrhardt 

d/p/build-Be-explicit-about-fcommon-compiler-directive.patch: fix FTBFS with gcc-10

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

ef2bbee... by Christian Ehrhardt 

changelog: fix the formerly avoided efi TPL issues (LP: #1882671)

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

1ff7163... by Christian Ehrhardt 

d/p/lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch: fix the formerly avoided efi TPL issues (LP: #1882671)

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

79d26dc... by Christian Ehrhardt 

1.0.0+git-20190125.36a4c85-5ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

aefb4c9... by Bastian Blank

1.0.0+git-20190125.36a4c85-5 (patches unapplied)

Imported using git-ubuntu import.