Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 804525 - app-emulation/qemu-6.1.0: version bump
Summary: app-emulation/qemu-6.1.0: version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Matthias Maier
URL:
Whiteboard:
Keywords: PullRequest
: 812449 (view as bug list)
Depends on:
Blocks:
 
Reported: 2021-07-26 13:09 UTC by Thomas Capricelli
Modified: 2021-09-23 02:08 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Capricelli 2021-07-26 13:09:05 UTC
Right now (july 26th), and probably for quite some time, only qemu 6.0.0 is available in portage.
But lxc/lxd only support previous versions, see https://github.com/lxc/lxd/issues/8854

Can we get previous ebuilds back ?

Reproducible: Always
Comment 1 Joonas Niilola gentoo-dev 2021-07-27 06:00:01 UTC
Can you test the patches provided in that issue?

mkdir -p /etc/portage/patches/app-emulation/qemu-6.0.0
cd /etc/portage/patches/app-emulation/qemu-6.0.0
wget https://patchew.org/QEMU/20210518131542.2941207-1-pbonzini@redhat.com/mbox https://patchew.org/QEMU/20210518154014.2999326-1-pbonzini@redhat.com/mbox
(possibly wget https://github.com/qemu/qemu/commit/941a4736d2b465be1d6429415f8b1f26e2167585.patch) note that this seems to apply for 6.1.0-rc which might have some conflicts with 6.0.0
then emerge -1av qemu and make sure it says "user patches applied". Does this fix the issue with qemu-6?
Comment 2 Joonas Niilola gentoo-dev 2021-07-27 06:00:37 UTC
Oh do rename the duplicate mbox patches.
Comment 3 Thomas Capricelli 2021-07-27 16:59:10 UTC
You want me to try emerging qemu 6.0.0 ? 


I downloaded all three patches you mention in proper location,then :

berlioz ~ # \emerge -1av qemu

These are the packages that would be merged, in order:

Calculating dependencies       ... done!       
[ebuild   R    ] app-emulation/qemu-6.0.0-r52::gentoo  USE="aio alsa bzip2 caps curl doc fdt filecaps gtk iscsi jpeg lzo ncurses nls opengl oss pin-upstream-blobs png python sdl seccomp slirp spice ssh static-user udev usb usbredir vhost-net virgl virtfs vnc xattr zstd -accessibility -capstone -debug -fuse -glusterfs -gnutls -infiniband -io-uring -jack -jemalloc -multipath -nfs -numa -plugins -pulseaudio -rbd -sasl -sdl-image (-selinux) -smartcard -snappy -static -systemtap -test -vde -vhost-user-fs -vte -xen -xfs" PYTHON_TARGETS="python3_9 -python3_10 -python3_8" QEMU_SOFTMMU_TARGETS="i386 x86_64 -aarch64 -alpha -arm -avr -cris -hppa -lm32 -m68k -microblaze -microblazeel -mips -mips64 -mips64el -mipsel -moxie -nios2 -or1k -ppc -ppc64 -riscv32 -riscv64 -rx -s390x -sh4 -sh4eb -sparc -sparc64 -tricore -unicore32 -xtensa -xtensaeb" QEMU_USER_TARGETS="arm i386 ppc ppc64 riscv32 riscv64 x86_64 -aarch64 -aarch64_be -alpha -armeb -cris -hexagon -hppa -m68k -microblaze -microblazeel -mips -mips64 -mips64el -mipsel -mipsn32 -mipsn32el -nios2 -or1k -ppc64abi32 -ppc64le -s390x -sh4 -sh4eb -sparc -sparc32plus -sparc64 -xtensa -xtensaeb" 0 KiB


(...)

 * Applying qemu-2.11.1-capstone_include_path.patch ...                                                                                                             [ ok ]
 * Applying qemu-5.2.0-strings.patch ...                                                                                                                            [ ok ]
 * Applying qemu-5.2.0-cleaner-werror.patch ...                                                                                                                     [ ok ]
 * Applying qemu-5.2.0-disable-keymap.patch ...
patching file meson.build
Hunk #1 succeeded at 422 with fuzz 1 (offset 85 lines).
patching file pc-bios/keymaps/meson.build
Hunk #1 succeeded at 33 with fuzz 1.                                                                                                                                [ ok ]
 * Applying qemu-5.2.0-dce-locks.patch ...                                                                                                                          [ ok ]
 * Applying qemu-6.0.0-make.patch ...                                                                                                                               [ ok ]
 * Applying 941a4736d2b465be1d6429415f8b1f26e2167585.patch ...                                                                                                      [ ok ]
 * User patches applied.


So it seems the patches in /etc/ were applied.

It all went ok after that.

But, iiuc, their issue is still opened, those patches aren't merged. I'm not asking for qemu 6 "monky-patched", but really for a previous stable/tested qemu 5.2.0 or similar.

I copied the last qemu<6 ebuild from portage git history, and so far it seems to work well.
Comment 4 Joonas Niilola gentoo-dev 2021-07-27 17:09:29 UTC
(In reply to Thomas Capricelli from comment #3)
> 
> It all went ok after that.

Thanks for testing!

> 
> But, iiuc, their issue is still opened, those patches aren't merged. I'm not
> asking for qemu 6 "monky-patched", but really for a previous stable/tested
> qemu 5.2.0 or similar.

Qemu <6.0.0 were removed due to security vulnerabilities, 
  https://bugs.gentoo.org/792624
so unless upstreams patches those security issues for 5.2.0, I don't see that version returning in Gentoo. Patching 6.0.0 might be the plan B, but it'd surely require a bit more testing (or a straight package.mask) so it won't break anything for non-lxd users.

> 
> I copied the last qemu<6 ebuild from portage git history, and so far it
> seems to work well.

That is definitely doable for now. Just be aware of the security issues in the previous version.
Comment 5 Joonas Niilola gentoo-dev 2021-08-12 18:03:40 UTC
>=qemu-6.1.0-rc2 (now latest is -rc3) should work, reading the linked upstream issue. 

Maybe we could ship that, unless 6.1.0 is out really soon.
Comment 6 John Helmert III archtester Gentoo Infrastructure gentoo-dev Security 2021-09-07 15:41:46 UTC
We can't restore the old ebuilds for security reasons, but it seems at this point a version bump is in order.
Comment 7 Matthew Smith gentoo-dev 2021-09-10 12:40:51 UTC
*** Bug 812449 has been marked as a duplicate of this bug. ***
Comment 8 Larry the Git Cow gentoo-dev 2021-09-23 02:08:30 UTC
The bug has been closed via the following commit(s):

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

commit 197fa637eb382e4abb3b33379d093bea2f33d708
Author:     John Helmert III <ajak@gentoo.org>
AuthorDate: 2021-09-20 00:49:43 +0000
Commit:     Matthias Maier <tamiko@gentoo.org>
CommitDate: 2021-09-23 02:08:22 +0000

    app-emulation/qemu: bump to 6.1.0
    
    Closes: https://bugs.gentoo.org/804525
    Signed-off-by: John Helmert III <ajak@gentoo.org>
    Signed-off-by: Matthias Maier <tamiko@gentoo.org>

 app-emulation/qemu/Manifest                       |   1 +
 app-emulation/qemu/files/qemu-6.1.0-strings.patch |  26 +
 app-emulation/qemu/qemu-6.1.0.ebuild              | 909 ++++++++++++++++++++++
 app-emulation/qemu/qemu-9999.ebuild               |  21 +-
 4 files changed, 946 insertions(+), 11 deletions(-)