Bug 740386 – =app-emulation/qemu-9999: Failed Patch: qemu-4.0.0-mkdir_systemtap.patch

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Darren Blaber 2020-09-04 13:34:35 UTC]

Live Ebuild =app-emulation/qemu-9999 fails to build due to failed patch:

 * Applying qemu-4.0.0-mkdir_systemtap.patch ...
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej

Rejects:
--- Makefile
+++ Makefile
@@ -803,6 +802,7 @@
 	$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
 endif
 ifdef CONFIG_TRACE_SYSTEMTAP
+	mkdir -p $(DESTDIR)$(bindir)
 	$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
 endif
 ifneq ($(BLOBS),)

There may be others, looks like qemu refactored the Makefile a bit.

[Comment 1 Sergei Trofimovich (RETIRED) 2020-09-05 06:18:29 UTC]

Yeah. Looking.

[Comment 2 Sergei Trofimovich (RETIRED) 2020-09-05 06:22:20 UTC]

scripts/qemu-trace-stap was moved from Makefile to some meson build file: https://github.com/qemu/qemu/commit/f5aa6320e83b0e8c1a14fd464b1fe6243c20b6d5

I'm not sure if we are using it. Let's remove a patch and fix it when/if it pops up again.

[Comment 3 Larry the Git Cow 2020-09-05 07:08:20 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec0190e65272dedb7759d7ab70495e259e7c567

commit 8ec0190e65272dedb7759d7ab70495e259e7c567
Author:     Sergei Trofimovich <[e-mail]>
AuthorDate: 2020-09-05 06:52:38 +0000
Commit:     Sergei Trofimovich <[e-mail]>
CommitDate: 2020-09-05 07:08:16 +0000

    app-emulation/qemu: drop outdated pixman-for-vhost-user-gpu.patch
    
    Reported-by: Darren Blaber
    Bug: https://bugs.gentoo.org/740386
    Package-Manager: Portage-3.0.5, Repoman-3.0.1
    Signed-off-by: Sergei Trofimovich <[e-mail]>

 app-emulation/qemu/qemu-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db151e97734c6c7519ee5632619cfe288c9a34b0

commit db151e97734c6c7519ee5632619cfe288c9a34b0
Author:     Sergei Trofimovich <[e-mail]>
AuthorDate: 2020-09-05 06:49:15 +0000
Commit:     Sergei Trofimovich <[e-mail]>
CommitDate: 2020-09-05 07:08:15 +0000

    app-emulation/qemu: refresh cflags.patch patch
    
    Reported-by: Darren Blaber
    Bug: https://bugs.gentoo.org/740386
    Package-Manager: Portage-3.0.5, Repoman-3.0.1
    Signed-off-by: Sergei Trofimovich <[e-mail]>

 app-emulation/qemu/files/qemu-9999-cflags.patch | 12 ++++++++++++
 app-emulation/qemu/qemu-9999.ebuild             |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b415e35c7ad2777f33b91cdf1e4747bd60e6c908

commit b415e35c7ad2777f33b91cdf1e4747bd60e6c908
Author:     Sergei Trofimovich <[e-mail]>
AuthorDate: 2020-09-05 06:24:48 +0000
Commit:     Sergei Trofimovich <[e-mail]>
CommitDate: 2020-09-05 07:08:15 +0000

    app-emulation/qemu: drop outdated mkdir_systemtap.patch patch
    
    Reported-by: Darren Blaber
    Bug: https://bugs.gentoo.org/740386
    Package-Manager: Portage-3.0.5, Repoman-3.0.1
    Signed-off-by: Sergei Trofimovich <[e-mail]>

 app-emulation/qemu/qemu-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

[Comment 4 Sergei Trofimovich (RETIRED) 2020-09-05 07:24:38 UTC]

Patches should apply now and ./configure should pass.

Thanks for the report!