Merge ~paride/ubuntu/+source/qemu:lp1952448-openssl3-ftbfs into ubuntu/+source/qemu:ubuntu/devel

[Paride Legovini]

d/patches: add lp-1952448-relax-skiboot-gcc-deprecation-errors.patch

Workaround for: LP: #1952448 (OpenSSL 3.0 FTBFS)

d/patches: add lp-1952448-relax-skiboot-gcc-deprecation-errors.patch

Workaround for: LP: #1952448 (OpenSSL 3.0 FTBFS)
Test PPA: https://launchpad.net/~paride/+archive/ubuntu/qemu-lp1952448

The test PPA has -proposed enabled and builds only on amd64. The component where the FTBFS happens is build only on amd64 in any case, so adding more archs isn't really helpful.

[Utkarsh Gupta (utkarsh)]

review: Needs Fixing

[Utkarsh Gupta (utkarsh)]

review: Needs Fixing

[Paride Legovini (paride)]

Amended per review comments.

I understand and share the desire for consistent

 * d/somefile: what changed

d/changelog entries, unfortunately for long d/p/*.patch files it's often difficult to fit that into a meaningful 1-line commit title, which is then picked up by `gbp dch` to construct the d/changelog entry, so these require manual mangling when running `gpb dch`.

/OCD :-)

[Utkarsh Gupta (utkarsh)]

LOL, I feel the same. But I've been consistent w/ what I mentioned in the comments:
d/filename: what changed or got added or dropped.

Anyway, another curious question I have is:
-> you used @debian.org for rebuilds of packages.
-> you're using @canonical.com in the patch's "Author" field.
-> you're using @ubuntu.com in the d/ch entry.

Why so many deviations? :P

Anyway, approving as other technical bits look correct to me.

review: Approve

[Paride Legovini (paride)]

Well, you asked for it :P

I used my @debian.org address in some rebuilds (not the qemu one AFAICT), because I do

export DEBFULLNAME="Paride Legovini"
export <email address hidden>"

via direnv(1) when I'm in in my Ubuntu/Canonical working directories, otherwise the default is <email address hidden> (I inherited my dotfiles from my Debian laptop). Now I sometimes prepare throwaway things outside of my $HOME, e.g. in /tmp or /dev/shm, so they don't stick around if I forget to cleanup. When I do this I get the default DEBEMAIL. (I should probably switch defaults.)

I used my @canonical.com address in the patch itself because the patch is code; I prepared it during my working hours and this has copyright implications. To make it clear the patch belongs to Canonical I used my @canonical.com address.

In the package maintainer fields and when interacting with the Ubuntu community I prefer to use my @ubuntu.com address (thus wearing my Ubuntu developer hat and not my Canonical engineer one). This is personal preference, rooted in the fact that I want to show that I'm doing Ubuntu stuff that any Ubuntu developer could do, and not special Canonical stuff. In other words I feel it blends better with the community.

[Paride Legovini (paride)]

The package built fine in the test PPA \o/

[Paride Legovini (paride)]

Uploaded:

Uploading qemu_6.0+dfsg-2expubuntu4.dsc
Uploading qemu_6.0+dfsg.orig.tar.xz
Uploading qemu_6.0+dfsg-2expubuntu4.debian.tar.xz
Uploading qemu_6.0+dfsg-2expubuntu4_source.buildinfo
Uploading qemu_6.0+dfsg-2expubuntu4_source.changes

diff --git a/debian/changelog b/debian/changelog
index 4999a3d..0a2a292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qemu (1:6.0+dfsg-2expubuntu4) jammy; urgency=medium
+
+  * d/p/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch:
+    add patch to workaround FTBFS when building against OpenSSL 3.0.
+    Thanks to Christian Ehrhardt (LP: #1952448)
+
+ -- Paride Legovini <[e-mail]>  Fri, 26 Nov 2021 15:47:51 +0100
+
 qemu (1:6.0+dfsg-2expubuntu3) jammy; urgency=medium
 
   * No-change rebuild against liburing2
diff --git a/debian/patches/series b/debian/patches/series
index 4752017..45bb03d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ ubuntu/lp-1929926-target-s390x-Fix-translation-exception-on-illegal-in.patch
 ubuntu/avoid-fcf-clashing-with-i486.patch
 ubuntu/lp-1932175-s390x-cpumodel-add-3931-and-3932.patch
 ubuntu/lp-1940288-audio-Never-send-migration-section.patch
+ubuntu/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch
diff --git a/debian/patches/ubuntu/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch b/debian/patches/ubuntu/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch
new file mode 100644
index 0000000..8818062
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch
@@ -0,0 +1,20 @@
+Description: Don't warn on deprecated declarations when building skiboot
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1952448
+Bug: https://github.com/open-power/skiboot/issues/271
+Forwarded: not-needed
+Author: Paride Legovini <[e-mail]>
+Last-Update: 2021-11-26
+
+--- a/roms/skiboot/Makefile.main
++++ b/roms/skiboot/Makefile.main
+@@ -33,6 +33,10 @@
+ 	  $(call try-cflag,$(CC),--Wno-stringop-truncation) \
+ 	  -Werror
+
++# Workaround for OpenSSL 3.0 FTBFS (LP: #1952448)
++# Upstream issue: https://github.com/open-power/skiboot/issues/271
++CWARNS += -Wno-deprecated-declarations
++
+ # Host tools and options
+ HOSTCC=gcc
+ HOSTEND=$(shell uname -m | sed -e 's/^i.*86$$/LITTLE/' -e 's/^x86.*/LITTLE/' -e 's/^ppc64le/LITTLE/' -e 's/^ppc.*/BIG/')