Merge ~paelzer/ubuntu/+source/ipxe:FTBFS-eoan-gcc9-bug-1843394 into ubuntu/+source/ipxe:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

ATM this is WIP waiting for upstream feedback.

[Christian Ehrhardt  (paelzer)]

Fixed build in PPA https://launchpad.net/~paelzer/+archive/ubuntu/bug-1843394-ipxe-ftbfs/+packages

[Christian Ehrhardt  (paelzer)]

=> https://bugs.launchpad.net/ubuntu/+source/ipxe/+bug/1843394/comments/3

It seems we eventually don't even use the object that triggers the FTBFS :-/

[Andreas Hasenack (ahasenack)]

packaging is fine, but I have no clue about the assembly patch. I checked upstream and no response yet, and no recent commit to their git tree either. One would think the person who supplied that other ftbfs patch would have hit the same problem. Maybe worth an email to Valentine Barshak <email address hidden>?

[Christian Ehrhardt  (paelzer)]

On Wed, Sep 11, 2019 at 3:40 PM Andreas Hasenack <email address hidden> wrote:
>
> packaging is fine, but I have no clue about the assembly patch. I checked upstream and no response yet, and no recent commit to their git tree either. One would think the person who supplied that other ftbfs patch would have hit the same problem. Maybe worth an email to Valentine Barshak <email address hidden>?

You need to build EFI parts (not default) or explicitly enable GDBSTUB
(no default) to hit it.
The issue that was fixed by him was hit with the default config.
But yeah, a mail can't hurt.

Unmerged commits

05ec26a... by Christian Ehrhardt  on 2019-09-10

changelog: Fix FTBFS in Eoan (LP: #1843394)

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

29ca620... by Christian Ehrhardt  on 2019-09-10

- d/p/lp-1843394-compilation-error-with-gcc-9.1.patch: avoid issues of type address-of-packed-member

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

b27b30a... by Christian Ehrhardt  on 2019-09-10

- d/p/FTFBS-gcc9.patch: fix gdb stub usage of segment registers

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

759bbbb... by Christian Ehrhardt  on 2019-02-19

Import patches-unapplied version 1.0.0+git-20190109.133f4c4-0ubuntu2 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Upload parent: fe9eed764b3010fe4869eae3535a8211113f84ea

fe9eed7... by Christian Ehrhardt  on 2019-02-19

changelog: Add e1000e firmware for qemu. (closes: #884240)

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

861253a... by Christian Ehrhardt  on 2019-02-19

* Add e1000e firmware for qemu. (closes: #884240)
  - d/ipxe-qemu.install: install new rom
  - d/util/check-rom-sizes: check new rom

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

141df1d... by Christian Ehrhardt  on 2019-01-09

Import patches-unapplied version 1.0.0+git-20190109.133f4c4-0ubuntu1 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Changelog parent: 671f316068d722f5969c304d635592bd54954b60

New changelog entries:
  * Merge new upstream release 1.0.0+git-20190109.133f4c4
    Remaining Changes:
    - d/p/enable-https.patch: Enable HTTPS support.
    - Split grub integration from ipxe->grub-ipxe.
      - d/control: add package and adapt dependencies
      - d/[grub-]ipxe.install: move some files to grub-ipxe
      - rename d/ipxe.post* to d/grub-ipxe-post*
    - Install ne.rom as pxe-ne2k_isa.rom
      - d/ipxe-qemu.install: Install ne.rom as pxe-ne2k_isa.rom.
      - d/ipxe-qemu.links: compat link for ne.rom
    - d/ipxe-qemu.links: Add compat links from /usr/share/qemu
      to /usr/lib/ipxe/qemu.
    - d/util/check-rom-sizes, d/rules: check sizes of generated roms to avoid
      accidentially breaking KVM live migration on updates/fixes.
    - handling of efi rom size changes in Bionic (LP 1713490)
      - d/util/check-rom-sizes: bump efi rom sizes
      - d/control: break older qemu versions to ensure the new sized roms
        are only associated with new qemu versions.
    - debian/patches/handle-dhcp-nack.patch: Handle DHCP NAK and send a
      re-discover. (LP 1707999)
    - updated debian/patches/util-elf2efi-GNU_SOURCE.patch to match latest
      upstream.
    - add new rom for vmxnet3 (LP 1737211)
      - d/ipxe-qemu.install: install new rom
        are only associated with new qemu versions.
    - Build ROMs for QEMU with CONFIG=qemu (LP: 1789319)
    - d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch: Strip 802.1Q VLAN 0
      priority tags; Fixes PXE when VLAN tag is 0. (LP: 1805920)
    - debian/copyright: update copyright information to satisfy lintian
      dep5 checks (LP: 1747071)
  * Dropped changes (upstream):
    - debian/patches/fix-elf2efi-plt-relocation.diff: Cherry-pick fix from
      ipxe devel mailing list to handle R_X86_64_PLT32 relocations.

671f316... by Andres Rodriguez on 2018-12-10

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu5 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Changelog parent: e0bcbbf3e69e789458aa7e98ed9cabde01d8c6cc

New changelog entries:
  * d/p/0005-strip-802.1Q-VLAN-0-priority-tags.patch: Strip 802.1Q VLAN 0
    priority tags; Fixes PXE when VLAN tag is 0. (LP: #1805920)

e0bcbbf... by Julian Andres Klode on 2018-09-10

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu4 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 6644bad73849a3c4b83be26eb631db0669351ce2

New changelog entries:
  * Build ROMs for QEMU with CONFIG=qemu (LP: #1789319)

6644bad... by Julian Andres Klode on 2018-09-10

Import patches-unapplied version 1.0.0+git-20180124.fbe8c52d-0ubuntu3 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 59fb9a7fd3444341a97bcfb4dc6208d4114d395f

New changelog entries:
  * debian/patches/fix-elf2efi-plt-relocation.diff: Cherry-pick fix from
    ipxe devel mailing list to handle R_X86_64_PLT32 relocations.

diff --git a/debian/changelog b/debian/changelog
index c11bbfa..b525bd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ipxe (1.0.0+git-20190109.133f4c4-0ubuntu3) eoan; urgency=medium
+
+  * Fix FTBFS in Eoan (LP: #1843394)
+    - d/p/lp-1843394-compilation-error-with-gcc-9.1.patch: avoid issues of
+      type address-of-packed-member
+    - d/p/FTFBS-gcc9.patch: fix gdb stub usage of segment registers
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 10 Sep 2019 10:41:43 +0200
+
 ipxe (1.0.0+git-20190109.133f4c4-0ubuntu2) disco; urgency=medium
 
   * Add e1000e firmware for qemu. (closes: #884240)
diff --git a/debian/patches/FTFBS-gcc9.patch b/debian/patches/FTFBS-gcc9.patch
new file mode 100644
index 0000000..ef07b2b
--- /dev/null
+++ b/debian/patches/FTFBS-gcc9.patch
@@ -0,0 +1,38 @@
+Description: experimental: size mismatch on segment register access
+ The GDB stubs break on new gcc for "operand type mismatch"
+Forwarded: yes, http://lists.ipxe.org/pipermail/ipxe-devel/2019-September/006763.html
+Author: Christian Ehrhardt <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1843394
+Last-Update: 2019-09-10
+--- a/src/arch/x86_64/core/gdbidt.S
++++ b/src/arch/x86_64/core/gdbidt.S
+@@ -106,8 +106,14 @@ gdbmach_sigill:
+ gdbmach_interrupt:
+ 
+ 	/* Create register dump */
+-	pushq	%gs
+-	pushq	%fs
++	pushw	$0
++	pushw	$0
++	pushw	$0
++	pushw	%gs
++	pushw	$0
++	pushw	$0
++	pushw	$0
++	pushw	%fs
+ 	pushq	$0		/* %es unused in long mode */
+ 	pushq	$0		/* %ds unused in long mode */
+ 	pushq	( frame_ss	- regs_ss	- SIZEOF_REG )(%rsp)
+@@ -158,8 +164,10 @@ gdbmach_interrupt:
+ 	popq	( frame_cs	- regs_cs	- SIZEOF_REG )(%rsp)
+ 	popq	( frame_ss	- regs_ss	- SIZEOF_REG )(%rsp)
+ 	addq	$( regs_fs - regs_ds ), %rsp	/* skip %ds, %es */
+-	popq	%fs
+-	popq	%gs
++	popw	%fs
++	add %rsp,6
++	popw	%gs
++	add %rsp,6
+ 
+ 	/* Skip code */
+ 	addq	$( gdb_end - gdb_code ), %rsp	/* skip code */
diff --git a/debian/patches/lp-1843394-compilation-error-with-gcc-9.1.patch b/debian/patches/lp-1843394-compilation-error-with-gcc-9.1.patch
new file mode 100644
index 0000000..e44ec3e
--- /dev/null
+++ b/debian/patches/lp-1843394-compilation-error-with-gcc-9.1.patch
@@ -0,0 +1,59 @@
+From 1dd56dbd11082fb622c2ed21cfaced4f47d798a6 Mon Sep 17 00:00:00 2001
+From: Valentine Barshak <[e-mail]>
+Date: Mon, 22 Jul 2019 10:47:50 +0100
+Subject: [PATCH] [build] Workaround compilation error with gcc 9.1
+
+Compiling with gcc 9.1 generates lots of "taking address of packed
+member of ... may result in an unaligned pointer value" warnings.
+
+Some of these warnings are genuine, and indicate correctly that parts
+of iPXE currently require the CPU (or runtime environment) to support
+unaligned accesses.  For example: the TCP/IP receive data path will
+attempt to access 32-bit fields that may not be aligned to a 32-bit
+boundary.
+
+Other warnings are either spurious (such as when the pointer is to a
+variable-length byte array, which can have no alignment requirement
+anyway) or unhelpful (such as when the pointer is used solely to
+provide a debug colour value for the DBGC() macro).
+
+There appears to be no easy way to silence the spurious warnings.
+Since the ability to perform unaligned accesses is already a
+requirement for iPXE, work around the problem by silencing this class
+of warnings.
+
+Signed-off-by: Valentine Barshak <[e-mail]>
+Modified-by: Michael Brown <[e-mail]>
+Signed-off-by: Michael Brown <[e-mail]>
+
+Origin: upstream, https://git.ipxe.org/ipxe.git/commit/1dd56dbd11082fb622c2ed21cfaced4f47d798a6
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1843394
+Last-Update: 2019-09-10
+
+---
+ src/Makefile.housekeeping | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
+index f8334921..4b09e81f 100644
+--- a/src/Makefile.housekeeping
++++ b/src/Makefile.housekeeping
+@@ -185,6 +185,15 @@ WNST_TEST = $(CC) -Wstringop-truncation -x c -c /dev/null -o /dev/null \
+ 		  >/dev/null 2>&1
+ WNST_FLAGS := $(shell $(WNST_TEST) && $(ECHO) '-Wno-stringop-truncation')
+ WORKAROUND_CFLAGS += $(WNST_FLAGS)
++
++# gcc 9.1 generates warnings for taking address of packed member which
++# may result in an unaligned pointer value.  Inhibit the warnings.
++#
++WNAPM_TEST = $(CC) -Wno-address-of-packed-member -x c -c /dev/null \
++		   -o /dev/null >/dev/null 2>&1
++WNAPM_FLAGS := $(shell $(WNAPM_TEST) && \
++		 $(ECHO) '-Wno-address-of-packed-member')
++WORKAROUND_CFLAGS += $(WNAPM_FLAGS)
+ endif
+ 
+ # Some versions of gas choke on division operators, treating them as
+-- 
+2.23.0
+
diff --git a/debian/patches/series b/debian/patches/series
index c66db88..df7499f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ util-elf2efi-GNU_SOURCE.patch
 enable-https.patch
 handle-dhcp-nack.patch
 0005-strip-802.1Q-VLAN-0-priority-tags.patch
+FTFBS-gcc9.patch
+lp-1843394-compilation-error-with-gcc-9.1.patch