Merge ~paelzer/ubuntu/+source/ipxe:fix-FTFBS-gcc-10-GROOVY into ubuntu/+source/ipxe:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4289/+packages
Upstream: https://github.com/ipxe/ipxe/commit/f982a712979619dbae2c6e0d741757e2ce94be11
Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966942

[Christian Ehrhardt  (paelzer)]

The original issue is fixed, but the (much) later geniso has a problem as well.
Looking at that now.

[Christian Ehrhardt  (paelzer)]

Fixed the image size issue as well, branch ready for review.

[Andreas Hasenack (ahasenack)]

+1
I was wondering if the image size needed to be a power of 2 or something like that, and that adding 1 could break it, but I found nothing in the mkfs.msdos about that.

review: Approve

[Christian Ehrhardt  (paelzer)]

It already was a non power of two number of KB before. The one is added after the division, so we add a full KB.

[Christian Ehrhardt  (paelzer)]

 * [new tag] upload/1.0.0+git-20190125.36a4c85-5ubuntu3 -> upload/1.0.0+git-20190125.36a4c85-5ubuntu3

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

diff --git a/debian/changelog b/debian/changelog
index 303357b..98dbeb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ipxe (1.0.0+git-20190125.36a4c85-5ubuntu3) groovy; urgency=medium
+
+  * d/p/build-Be-explicit-about-fcommon-compiler-directive.patch: fix
+    FTBFS with gcc-10
+  * d/util/geniso: fix FTBFS due to rounding issues
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 01 Oct 2020 10:14:14 +0200
+
 ipxe (1.0.0+git-20190125.36a4c85-5ubuntu2) groovy; urgency=medium
 
   * d/p/lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch: fix the
diff --git a/debian/patches/build-Be-explicit-about-fcommon-compiler-directive.patch b/debian/patches/build-Be-explicit-about-fcommon-compiler-directive.patch
new file mode 100644
index 0000000..5ea8978
--- /dev/null
+++ b/debian/patches/build-Be-explicit-about-fcommon-compiler-directive.patch
@@ -0,0 +1,35 @@
+From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001
+From: Bruce Rogers <[e-mail]>
+Date: Wed, 6 May 2020 15:03:02 -0600
+Subject: [PATCH] [build] Be explicit about -fcommon compiler directive
+
+gcc10 switched default behavior from -fcommon to -fno-common.  Since
+"__shared" relies on the legacy behavior, explicitly specify it.
+
+Signed-off-by: Bruce Rogers <[e-mail]>
+Modified-by: Michael Brown <[e-mail]>
+Signed-off-by: Michael Brown <[e-mail]>
+
+Origin: upstream, https://github.com/ipxe/ipxe/commit/f982a712979619dbae2c6e0d741757e2ce94be11
+Applied-Upstream: not yet, post 1.20.1
+Last-Update: 2020-10-01
+
+---
+ src/Makefile.housekeeping | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
+index 66d6dd449..b6c61c112 100644
+--- a/src/Makefile.housekeeping
++++ b/src/Makefile.housekeeping
+@@ -418,6 +418,7 @@ CFLAGS		+= -Os
+ CFLAGS		+= -g
+ ifeq ($(CCTYPE),gcc)
+ CFLAGS		+= -ffreestanding
++CFLAGS		+= -fcommon
+ CFLAGS		+= -Wall -W -Wformat-nonliteral
+ HOST_CFLAGS	+= -Wall -W -Wformat-nonliteral
+ endif
+-- 
+2.28.0
+
diff --git a/debian/patches/series b/debian/patches/series
index d5c97a2..167b657 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian-changes
 handle-dhcp-nack.patch
 0005-strip-802.1Q-VLAN-0-priority-tags.patch
 lp-1882671-efi-Raise-TPL-during-driver-entry-point.patch
+build-Be-explicit-about-fcommon-compiler-directive.patch
diff --git a/debian/util/geniso b/debian/util/geniso
index 13d9275..420533a 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 ))
+blocks=$(((($(stat -c %s "$EFI") / 1024 + 55) / 32 * 32 )+1))
 mkfs.msdos -C ${dir}/efi.img $blocks >/dev/null
 mmd -i ${dir}/efi.img ::efi
 mmd -i ${dir}/efi.img ::efi/boot