Merge ~paelzer/ubuntu/+source/ipxe:fix-efi-iso-sizes-HIRSUTE into ubuntu/+source/ipxe:ubuntu/hirsute-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This was perfectly reproducible in a local build and is x86 only.
With the fix it works fine now.

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

[Utkarsh Gupta (utkarsh)]

The commit message is descriptive, which helps me understand the problem and the solution. Great work. The solution also makes sense, at least, theoretically. So that's good as well.

One thing that I'd explicitly like to say is that I love these things being forwarded to Debian via MR, I really appreciate that! \o/

That said, I've two small questions:

1. If you don't intend to upload this now/this cycle (or do you?), can we wait for Debian to merge this and then merge from there? Either way, not a problem.

2. I'm curious to know how other distributions or such deal with this? Is this calculation taken from somewhere "central" or something? I'd like to know more about how and where are 1024, 55, and 32 coming from?

review: Needs Information

[Christian Ehrhardt  (paelzer)]

...

> 1. If you don't intend to upload this now/this cycle (or do you?), can we wait for Debian to merge this and then merge from there? Either way, not a problem.

I intend to upload now, we already have delta - this just makes it better

> 2. I'm curious to know how other distributions or such deal with this? Is this calculation taken from somewhere "central" or something? I'd like to know more about how and where are 1024, 55, and 32 coming from?

This was added by the Debian maintainer without context, I don't know
either where exactly they come from (I've mentioned that I don't know
in the Debian MR).

[Utkarsh Gupta (utkarsh)]

Hi Christian,

> I intend to upload now, we already have delta - this just
> makes it better

Aah, okay. I assumed that you didn't want to upload now since it was lacking the d/ch entry previously. But thanks for pushing that, all good now.

* Changelog:
  - [✔] changelog entry correct version and targeted codename
  - [✔] changelog entries correct
  - [✔] update-maintainer has been run

* Actual changes:
  - [✔] debian changes look safe

* Old Delta:
  - [✔] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [✔] no new patches added

* Build/Test:
  - [✔] build is ok
  - [✔] verified PPA package installs/uninstalls
  - [✔] autopkgtest against the PPA package passes

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, this needs to wait for the beta freeze to be lifted for being in

$ seeded-in-ubuntu ipxe
...
ipxe-qemu (from ipxe) is seeded in:
  ubuntu: daily-preinstalled

Other than that I think it is ready to go.

[Christian Ehrhardt  (paelzer)]

[16:24] <doko> cpaelzer: yesterday v_orlon and sil2101 said that uploading and building would be ok. the packages are then blocked to not migrate
[16:24] <sil2100> rbalint: ok, thanks
[16:24] <sil2100> cpaelzer: daily-preinstalled are our preinstalled images such as the raspi desktop images
[16:25] <sil2100> Meaning, this is on our official images that we ship to users
[16:25] <sil2100> But yeah, I can accept FTBFS fixes into hirsute-proposed right now, since even if we are to push some fixes for the beta to those, we need the packages buildable
[16:25] <sil2100> So we'd need the FTBFS fix there anyway

Thereby
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ipxe
 * [new tag] upload/1.0.0+git-20190125.36a4c85-5ubuntu4 -> upload/1.0.0+git-20190125.36a4c85-5ubuntu4

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu4.dsc: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu4.debian.tar.xz: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu4_source.buildinfo: done.
  Uploading ipxe_1.0.0+git-20190125.36a4c85-5ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 98dbeb9..41e1095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ipxe (1.0.0+git-20190125.36a4c85-5ubuntu4) hirsute; urgency=medium
+
+  * d/u/geniso: fix rounding to unbreak iso creation
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 30 Mar 2021 10:09:06 +0200
+
 ipxe (1.0.0+git-20190125.36a4c85-5ubuntu3) groovy; urgency=medium
 
   * d/p/build-Be-explicit-about-fcommon-compiler-directive.patch: fix
diff --git a/debian/util/geniso b/debian/util/geniso
index 420533a..308c777 100755
--- a/debian/util/geniso
+++ b/debian/util/geniso
@@ -32,7 +32,7 @@ cp /usr/lib/ISOLINUX/isolinux.bin ${dir}
 cp /usr/lib/syslinux/modules/bios/ldlinux.c32 ${dir}
 
 # generate EFI boot image
-blocks=$(((($(stat -c %s "$EFI") / 1024 + 55) / 32 * 32 )+1))
+blocks=$((($(stat -c %s "$EFI") / 1024 + 55 + 1) / 32 * 32 ))
 mkfs.msdos -C ${dir}/efi.img $blocks >/dev/null
 mmd -i ${dir}/efi.img ::efi
 mmd -i ${dir}/efi.img ::efi/boot