Merge ~sergiodj/ubuntu/+source/qemu:fix-binary-indep-build-ubuntu into ubuntu/+source/qemu:ubuntu/devel

[Sergio Durigan Junior]

This MP fixes a problem that's currently affecting qemu on mantic-proposed and making it not build qemu-system-data.

The problem happens because we don't have a separate "all" architecture (like Debian does; instead, we perform the indep build on amd64 alongside the regular binary build), and for this reason we have to make sure that everything properly runs on both binary-{arch,indep} targets. However, due to a premature optimization done in Debian, both targets depend on a single one called binary-helper which gets called only once during the build.

The fix is to undo this optimization. I will propose the same change to Debian, because arguably this is a generic bug in how the rules were written.

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/qemu/+packages

PPA build for amd64, showing qemu-system-data: https://launchpad.net/~sergiodj/+archive/ubuntu/qemu/+build/26751163

[Sergio Durigan Junior (sergiodj)]

I asked for Steve's review, and he said:

"no :) please upload and I'll review there"

Doing so.

Uploaded:

$ dput qemu_8.0.4+dfsg-1ubuntu3_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/qemu/qemu_8.0.4+dfsg-1ubuntu3_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/qemu/qemu_8.0.4+dfsg-1ubuntu3.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_8.0.4+dfsg-1ubuntu3.dsc: done.
  Uploading qemu_8.0.4+dfsg-1ubuntu3.debian.tar.xz: done.
  Uploading qemu_8.0.4+dfsg-1ubuntu3_source.buildinfo: done.
  Uploading qemu_8.0.4+dfsg-1ubuntu3_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 78d413d..a668570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qemu (1:8.0.4+dfsg-1ubuntu3) mantic; urgency=medium
+
+  * d/rules: Get rid of binary-helper target; explicitly invoke its
+    commands under binary-{arch,indep}.  This makes the build succeed
+    again in Ubuntu, where binary-helper wasn't being properly invoked.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 03 Oct 2023 18:13:20 -0400
+
 qemu (1:8.0.4+dfsg-1ubuntu2) mantic; urgency=medium
 
   * d/rules: Incorporate the following changes from Debian unstable, in
diff --git a/debian/rules b/debian/rules
index 67fd7d6..bf79d1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -497,8 +497,11 @@ ifeq (${enable-linux-user},y)
 	  echo "built-using=$$srcs" >> debian/qemu-user-static.substvars ; \
 	fi
 endif
-binary-arch: install-arch binary-helper
-binary-arch: a=-a
+binary-arch: install-arch
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 ##############################################
 ### firmware, qemu-user-data package
@@ -701,24 +704,22 @@ install-indep: pre-install-indep $(addprefix install-, ${sysdata-components})
 	dh_lintian -i
 	dh_compress -i
 	dh_fixperms -i
-binary-indep: install-indep binary-helper
-binary-indep: a=-i
+binary-indep: install-indep
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 build: build-arch build-indep
 install: install-arch install-indep
 binary: binary-arch binary-indep
-binary-helper:
-	dh_installdeb $a
-	dh_gencontrol $a
-	dh_md5sums $a
-	dh_builddeb $a
 
 clean:	debian/control
 	dh_clean \
 		b/ \
 		configs/devices/x86_64-softmmu/microvm.mak \
 
-.PHONY: build install binary binary-helper clean
+.PHONY: build install binary clean
 
 ifneq (,$(wildcard debian/control-in))
 # only include rules for debian/control if debian/control-in is present