From unknown Thu Aug 14 17:30:23 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#45014 <45014@debbugs.gnu.org> To: bug#45014 <45014@debbugs.gnu.org> Subject: Status: QEMU 5.2.0 update - functions properly but still work in progress Reply-To: bug#45014 <45014@debbugs.gnu.org> Date: Fri, 15 Aug 2025 00:30:23 +0000 retitle 45014 QEMU 5.2.0 update - functions properly but still work in prog= ress reassign 45014 guix-patches submitter 45014 Leo Famulari severity 45014 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 02 13:24:13 2020 Received: (at submit) by debbugs.gnu.org; 2 Dec 2020 18:24:13 +0000 Received: from localhost ([127.0.0.1]:37349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkWnP-00060i-QA for submit@debbugs.gnu.org; Wed, 02 Dec 2020 13:24:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:37388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkWnN-00060a-Kd for submit@debbugs.gnu.org; Wed, 02 Dec 2020 13:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkWnN-00005R-Cb for guix-patches@gnu.org; Wed, 02 Dec 2020 13:24:05 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:59139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkWnI-0008Mu-7c for guix-patches@gnu.org; Wed, 02 Dec 2020 13:24:05 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 58F3AA52; Wed, 2 Dec 2020 13:23:58 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 02 Dec 2020 13:23:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:subject:message-id:mime-version:content-type; s= mesmtp; bh=Gr7RIRhIfToiTGHh+AWO/H8ZNgT0+ITKxfQFH53tY4Y=; b=DJ/4o /dpsxsPk7Cyuwlngwuf35t5cx2o2UQixE3q1bK6j+yY2ImeGpxZm4XrkYbc3mYhY LP33HAlVma59WonGZN2yvqndRqezE9ulKZvVyrpV0gGAKNDxqrBm+D23yukEKO9O EdwgpunhLq2DPTMsc29XkomoLuMOy1YogQtebY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=Gr7RIRhIfToiTGHh+AWO/H8ZNgT0+ ITKxfQFH53tY4Y=; b=VWAJl9GYylXppEiUyzA1cFflHTbYXpsk91jh1jOWMKVgo 1BsEqv98CYPYvGmVg1nBu7KpY6q8kZgz+2Asc7QfqOiKCvRRDeVKpttp+FUEwX1e ica3iUeDNJw2KzhIQ5pFxIiqdLe4XyRqwVURF8Xu6PK+g3p2Z+eBzxYCK/5vQ1v0 62oUTuL40qRiqhdyi5CM3Q8XP1gex3vjGZDGajRDkv3OWVt7SoYIyb5d3wfiD25k nWrqK/0RXsc9lPaWZGStWfzjJyElMaV9AHbWsWSdhxPl9+kHNsHZ9ZizxZjom5DE kHTBzPv0nbbKosDaAYpTJ+lym5kU6fx3PrT52exGw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeigedguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfggtggusehgtderre dttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeejieeutdffleegudehgefhhfduueeule evveeggeehveffkeeihfevvdfhkeefvdenucfkphepjeefrddugedurdduvdejrddugeei necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 412E124005D for ; Wed, 2 Dec 2020 13:23:57 -0500 (EST) Date: Wed, 2 Dec 2020 13:23:55 -0500 From: Leo Famulari To: guix-patches@gnu.org Subject: QEMU 5.2.0 update - functions properly but still work in progress Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hF9h5LQyKcYDwyOW" Content-Disposition: inline Received-SPF: pass client-ip=64.147.123.24; envelope-from=leo@famulari.name; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --hF9h5LQyKcYDwyOW Content-Type: multipart/mixed; boundary="9yhtmFSyvMRoAzkv" Content-Disposition: inline --9yhtmFSyvMRoAzkv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Here is a patch that updates QEMU to 5.2.0-rc4. The big change here is that the build system has changed to use Meson and Ninja "under the hood", although this release still uses `./configure && make` in a superficial way. With this patch, the qemu and qemu-minimal packages build and can boot Guix VMs created with the `guix system` commands. There are still two open tasks that require assistance: 1) The patch that makes Sphinx build an info manual will need to be adapted to the meson build system. Ideally, this would be submitted upstream. 2) The ./configure step is considered "stale" in the build phase and thus gets run twice. You can add "--trace" to #:make-flags to trace the Makefile and try to understand what's wrong (shown below). I'm no Make expert but, AFAICT, there are some PHONY targets that depend on the output of the configure step, config-host.mak, so it may be an upstream bug. But I might be misunderstanding it. I asked on the QEMU IRC but didn't get a useful answer. ------ starting phase `build' GNUmakefile:10: update target 'all' due to: force echo 'changing dir to build for make ""...' changing dir to build for make ""... make -C build -f Makefile=20 make[1]: Entering directory '/tmp/guix-build-qemu-minimal-5.2.0-rc4.drv-0/q= emu-5.2.0-rc4/build' Makefile:109: update target 'config-host.mak' due to: /tmp/guix-build-qemu-= minimal-5.2.0-rc4.drv-0/qemu-5.2.0-rc4/pc-bios echo config-host.mak is out-of-date, running configure config-host.mak is out-of-date, running configure if test -f meson-private/coredata.dat; then \ ./config.status --skip-meson; \ else \ ./config.status && touch build.ninja.stamp; \ fi ------ --9yhtmFSyvMRoAzkv Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-WIP-QEMU-Update-to-5.2.0-rc4.patch" Content-Transfer-Encoding: quoted-printable =46rom 37e261512f5b3a3e7544c31d2b001d71c547d08c Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sat, 28 Nov 2020 00:33:13 -0500 Subject: [PATCH] WIP: QEMU: Update to 5.2.0-rc4. * gnu/packages/virtualization.scm (qemu): Update to 5.2.0-rc4. [source]: TODO Update patch building the info manual. [arguments]: Adjust the 'disable-unusable-tests' for the new Meson build system. Generalize the 'patch-/bin/sh-references' into a 'patch-paths' phas= e, and move an instance of path patching into it from the 'configure' phase. [native-inputs]: Add ninja. * gnu/packages/patches/qemu-build-info-manual.patch: Adjust to 5.2.0-rc4. --- gnu/packages/virtualization.scm | 34 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 466e9d1ac5..e2b2508efa 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -80,6 +80,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) + #:use-module (gnu packages ninja) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) @@ -132,15 +133,16 @@ (define-public qemu (package (name "qemu") - (version "5.1.0") + (version "5.2.0-rc4") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 (base32 - "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) - (patches (search-patches "qemu-build-info-manual.patch")))) + "10xsnw9sscknb6abd4h45k6gjzhqpdrvk9h8djbh7y1vh1zg76i9")) +; (patches (search-patches "qemu-build-info-manual.patch")) +)) (outputs '("out" "doc")) ;4.7 MiB of HTML docs (build-system gnu-build-system) (arguments @@ -188,30 +190,28 @@ (string-append match "9"))))) (add-after 'unpack 'disable-unusable-tests (lambda _ - (substitute* "tests/Makefile.include" + (substitute* "tests/meson.build" ;; Comment out the test-qga test, which needs /sys and ;; fails within the build environment. - (("check-unit-.* tests/test-qga" all) + (("tests.*test-qga.*$" all) (string-append "# " all)) ;; Comment out the test-char test, which needs networking a= nd ;; fails within the build environment. - (("check-unit-.* tests/test-char" all) - (string-append "# " all))) - (substitute* "tests/qtest/Makefile.include" - ;; Disable the following test, which triggers a crash on so= me - ;; x86 CPUs (see https://issues.guix.info/43048 and - ;; https://bugs.launchpad.net/qemu/+bug/1896263). - (("check-qtest-i386-y \\+=3D bios-tables-test" all) + (("'test-char':.*$" all) (string-append "# " all))) #t)) - (add-after 'patch-source-shebangs 'patch-/bin/sh-references + (add-after 'patch-source-shebangs 'patch-embedded-shebangs (lambda _ ;; Ensure the executables created by these source files refer= ence ;; /bin/sh from the store so they work inside the build conta= iner. (substitute* '("block/cloop.c" "migration/exec.c" "net/tap.c" "tests/qtest/libqtest.c") (("/bin/sh") (which "sh"))) + (substitute* "tests/qemu-iotests/check" + (("#!/usr/bin/env python3") + (string-append "#!" (which "python3")))) #t)) + ;; XXX ./configure is being re-run at beginning of build phase... (replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) @@ -220,14 +220,9 @@ (let ((out (assoc-ref outputs "out"))) (setenv "SHELL" (which "bash")) =20 - ;; While we're at it, patch for tests. - (substitute* "tests/qemu-iotests/check" - (("#!/usr/bin/env python3") - (string-append "#!" (which "python3")))) - ;; Ensure config.status gets the correct shebang off the ba= t. ;; The build system gets confused if we change it later and - ;; attempts to re-run the whole configury, and fails. + ;; attempts to re-run the whole configuration, and fails. (substitute* "configure" (("#!/bin/sh") (string-append "#!" (which "sh")))) @@ -302,6 +297,7 @@ exec smbd $@"))) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("python-sphinx" ,python-sphinx) + ("ninja" ,ninja) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") --=20 2.29.2 --9yhtmFSyvMRoAzkv-- --hF9h5LQyKcYDwyOW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl/H27sACgkQJkb6MLrK fwiouQ/7BNBpaZZWUVSJqsfmcSfc7kw0EqNo+7GeeJhDMKK8yFh5tXh3GgatOoby X9MHuiO0gMt+bKZSEbeSbmkd7jnzmDvmtjXvSl1zvEuY9vLEtwqPSAt/57bAJ8oR 16ofPYDo5l/WuluJ35DUyPoXkbGQWIHRF49YvauIZFma+893NXU1SdZ6mmFVs133 YxJlWpdmwYrfCM0+CkFDGg6ylV1gWi9QZsH+WOz75xNICVVhHWkpOmgvU1xNXxaP TD6O/uwq7Gu+rvzfEhEo6oipMx9luuse0vkwzR5mWA/PJ7IZI/0QbnEQi4GeHMtP bLvWAYt91CoueG3L9D8PaQx/Q7ETzymgetVZmK4ekcPXeooMxpTdIp5OfXG+ffgZ DiPVCD7G0gMpxSTXL/H7htoIzMIJ1Mi0zdQb/2dunNMcwMf9Og5xLzVb/FCM07qB RPoG3GRWQCA4njnXHhqiJbDGSXsa2/FxT0M5b+TFBo7hEbL78L4bhgWXDYcQ4kex NFnqZSXMoiMwla5xAdo5ShzKy86xVTFLnlyCh2ozhS2PjWqCl9DFkyvsjUJGt5ak 8/RfuySIDdXnhkvUG2qwJg+wy32T9zSQ+T/58vusM1r8rC0fghXAMuWQcwqwFq7N cR0nGchDr3XAiFJhebwZxyoXTkAI0J32Y2MSnQopT5JFUoauU8Y= =X3Xo -----END PGP SIGNATURE----- --hF9h5LQyKcYDwyOW-- From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 26 23:09:05 2021 Received: (at 45014) by debbugs.gnu.org; 27 Feb 2021 04:09:05 +0000 Received: from localhost ([127.0.0.1]:42951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFquV-0001BE-NV for submit@debbugs.gnu.org; Fri, 26 Feb 2021 23:09:05 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:45325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFquT-0001B0-DQ for 45014@debbugs.gnu.org; Fri, 26 Feb 2021 23:08:54 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 3044B6E6; Fri, 26 Feb 2021 23:08:47 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 26 Feb 2021 23:08:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=mesmtp; bh=u+MazOmxfuQgvrkVKChkSSrjv5t1TolhhLaFrPFbAB4=; b=DL 2STifaZOz13Va1sbrVVAQ/dOJYhLe0Ej2XJNyslJd2O0jcR8/diaP19GKMKfcR0I nxgHvHKPs59Ojlgt66Skq++ITTV+uiqkmKyPC1x3uXJVFUJivWGYmHE7z3h6dGNK odN4KlXqUICf0R4WPQd+Nkz56aprtvJqH3JCiRG78= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=u+MazOmxfuQgvrkVKChkSSrjv5t1T olhhLaFrPFbAB4=; b=pGzcZYSM6IK50Aw97f77QzLBAa9nBLQsVV/a36xP7DZWq 58i6btQFOhvhsBalpx0yXLiy+titXv6F1gC03Anbh57hgtNFzlXrtXfCwsDW4DTR pEG9UFjk9KRJq5nn5lgJLqacS2jsy3/AEXbw5gQHK2yB5y33ze0dyqhTJBcoQ4Yz Dpcw2IzKYun1LjM3II4ZmL1Q7sLA4fLg9cSthzQw6D+i1IBLKBfbgNKgrAoFf+on BWqClc5rMLeXfjQM8m/brTZBWUL1IJhYulg4JzHbtYWbACWLrXJYDNE5jblhmO8+ 1BarBjblivAbWR1DZVW03buGA+e7vQYJwe4LCBBZg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrledvgdeikecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkgggtugesghdtroertddtvdenucfhrhhomhepnfgvohcuhfgrmhhu lhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnh epjeekjefgtdffgedvtdfhheejledvlefhueeiteevvdejffelgedvfeffvdevgeeknecu kfhppedutddtrdduuddrudeiledruddukeenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 89B4B24005A; Fri, 26 Feb 2021 23:08:46 -0500 (EST) Date: Fri, 26 Feb 2021 23:08:45 -0500 From: Leo Famulari To: 45014@debbugs.gnu.org Subject: Re: QEMU 5.2.0 update - functions properly but still work in progress Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="O4N/iBR+0SRGX8mf" Content-Disposition: inline X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45014 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --O4N/iBR+0SRGX8mf Content-Type: multipart/mixed; boundary="BeWefNLPnXxbq7RF" Content-Disposition: inline --BeWefNLPnXxbq7RF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Here is a new revision of this patch. It updates QEMU to the final 5.2.0 release, rather than using a release candidate. --BeWefNLPnXxbq7RF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-QEMU-Update-to-5.2.0.patch" Content-Transfer-Encoding: quoted-printable =46rom 8fdecf103773af436ce636556ee94604e5d94939 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sat, 28 Nov 2020 00:33:13 -0500 Subject: [PATCH] gnu: QEMU: Update to 5.2.0. * gnu/packages/virtualization.scm (qemu): Update to 5.2.0. [source]: Remove 'qemu-build-info-manual' and don't build an info manual. [arguments]: Adjust the 'disable-unusable-tests' for the new Meson build system. Generalize the 'patch-/bin/sh-references' into a 'patch-paths' phas= e, and move an instance of path patching into it from the 'configure' phase. [native-inputs]: Add ninja. * gnu/packages/patches/qemu-build-info-manual.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/qemu-build-info-manual.patch | 139 ------------------ gnu/packages/virtualization.scm | 38 ++--- 3 files changed, 16 insertions(+), 162 deletions(-) delete mode 100644 gnu/packages/patches/qemu-build-info-manual.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8d1465158a..2c2c859ee0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1560,7 +1560,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ - %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ diff --git a/gnu/packages/patches/qemu-build-info-manual.patch b/gnu/packag= es/patches/qemu-build-info-manual.patch deleted file mode 100644 index d57b26ea00..0000000000 --- a/gnu/packages/patches/qemu-build-info-manual.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 07303a0a4daa83a0555ac4abad7a5d65584307ad Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Thu, 17 Sep 2020 13:28:19 -0400 -Subject: [PATCH] build: Build and install the info manual. - -Take advantage of the Sphinx texinfo backend to generate a QEMU info -manual. The texinfo format allows for more structure and info readers -provide more advanced navigation capabilities compared to manpages -readers. - -* configure (infodir): Add the --infodir option, which allows -configuring the directory under which the info manuals are installed. -* docs/index.rst: Include the top level documents to prevent -warnings (treated as errors by sphinx-build). -* Makefile (sphinxdocs-info, $(MANUAL_BUILDDIR)/QEMU.texi)): New targets. -(info): Depend on sphinxdocs-info. -(install-doc): Install the info manual. ---- - Makefile | 13 +++++++++++-- - configure | 7 +++++++ - docs/index.rst | 2 ++ - 3 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 13dd708c..da78612d 100644 ---- a/Makefile -+++ b/Makefile -@@ -864,12 +864,14 @@ endef - # Note that we deliberately do not install the "devel" manual: it is - # for QEMU developers, and not interesting to our users. - .PHONY: install-sphinxdocs --install-sphinxdocs: sphinxdocs -+install-sphinxdocs: sphinxdocs sphinxdocs-info - $(call install-manual,interop) - $(call install-manual,specs) - $(call install-manual,system) - $(call install-manual,tools) - $(call install-manual,user) -+ $(INSTALL_DIR) "$(DESTDIR)$(infodir)" -+ $(INSTALL_DATA) $(MANUAL_BUILDDIR)/QEMU.info "$(DESTDIR)$(infodir)" -=20 - install-doc: $(DOCS) install-sphinxdocs - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" -@@ -1067,6 +1069,13 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ - $(MANUAL_BUILDDIR)/tools/index.html \ - $(MANUAL_BUILDDIR)/user/index.html -=20 -+# Build the complete info manual. -+.PHONE: sphinxdocs-info -+sphinxdocs-info: $(MANUAL_BUILDDIR)/QEMU.info -+ -+$(MANUAL_BUILDDIR)/QEMU.texi: $(call manual-deps,*) $(wildcard $(SRC_PATH= )/docs/*.rst) -+ $(call build-manual,,texinfo) -+ - # Canned command to build a single manual - # Arguments: $1 =3D manual name, $2 =3D Sphinx builder ('html' or 'man') - # Note the use of different doctree for each (manual, builder) tuple; -@@ -1126,7 +1135,7 @@ docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/q= ga-qapi-doc.texi - @cp -p $< $@ -=20 - html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinx= docs --info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info -+info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info sphinx= docs-info - pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf - txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt -=20 -diff --git a/configure b/configure -index 2acc4d14..3691bd2e 100755 ---- a/configure -+++ b/configure -@@ -415,6 +415,7 @@ LDFLAGS_SHARED=3D"-shared" - modules=3D"no" - module_upgrades=3D"no" - prefix=3D"/usr/local" -+infodir=3D"\${prefix}/share/info" - mandir=3D"\${prefix}/share/man" - datadir=3D"\${prefix}/share" - firmwarepath=3D"\${prefix}/share/qemu-firmware" -@@ -987,6 +988,7 @@ if test "$mingw32" =3D "yes" ; then - LIBS=3D"-liberty $LIBS" - fi - prefix=3D"c:/Program Files/QEMU" -+ infodir=3D"\${prefix}" - mandir=3D"\${prefix}" - datadir=3D"\${prefix}" - qemu_docdir=3D"\${prefix}" -@@ -1087,6 +1089,8 @@ for opt do - static=3D"yes" - QEMU_PKG_CONFIG_FLAGS=3D"--static $QEMU_PKG_CONFIG_FLAGS" - ;; -+ --infodir=3D*) infodir=3D"$optarg" -+ ;; - --mandir=3D*) mandir=3D"$optarg" - ;; - --bindir=3D*) bindir=3D"$optarg" -@@ -1780,6 +1784,7 @@ Advanced options (experts only): - --smbd=3DSMBD use specified smbd [$smbd] - --with-git=3DGIT use specified git [$git] - --static enable static build [$static] -+ --infodir=3DPATH install info manual in PATH - --mandir=3DPATH install man pages in PATH - --datadir=3DPATH install firmware in PATH$confsuffix - --docdir=3DPATH install documentation in PATH$confsuffix -@@ -6836,6 +6841,7 @@ echo "include directory $(eval echo $includedir)" - echo "config directory $(eval echo $sysconfdir)" - if test "$mingw32" =3D "no" ; then - echo "local state directory $(eval echo $local_statedir)" -+echo "Info manual directory $(eval echo $infodir)" - echo "Manual directory $(eval echo $mandir)" - echo "ELF interp prefix $interp_prefix" - else -@@ -7059,6 +7065,7 @@ echo "bindir=3D$bindir" >> $config_host_mak - echo "libdir=3D$libdir" >> $config_host_mak - echo "libexecdir=3D$libexecdir" >> $config_host_mak - echo "includedir=3D$includedir" >> $config_host_mak -+echo "infodir=3D$infodir" >> $config_host_mak - echo "mandir=3D$mandir" >> $config_host_mak - echo "sysconfdir=3D$sysconfdir" >> $config_host_mak - echo "qemu_confdir=3D$qemu_confdir" >> $config_host_mak -diff --git a/docs/index.rst b/docs/index.rst -index 763e3d04..4f155b51 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -9,6 +9,7 @@ Welcome to QEMU's documentation! - .. toctree:: - :maxdepth: 2 - :caption: Contents: -+ :glob: -=20 - system/index - user/index -@@ -16,3 +17,4 @@ Welcome to QEMU's documentation! - interop/index - specs/index - devel/index -+ * ---=20 -2.28.0 - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.= scm index 8da57cf6ab..ba8797a09c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -80,6 +80,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) + #:use-module (gnu packages ninja) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) @@ -133,15 +134,14 @@ (define-public qemu (package (name "qemu") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 (base32 - "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) - (patches (search-patches "qemu-build-info-manual.patch")) + "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b")) (modules '((guix build utils))) (snippet '(begin @@ -157,9 +157,9 @@ (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=3D.*$" = _ indent) (string-append indent "target_ifreq_size =3D thunk_ty= pe_size(ifreq_max_type, 0);"))) #t)))) - (outputs '("out" "doc")) ;4.7 MiB of HTML docs - (build-system gnu-build-system) - (arguments + (outputs '("out" "doc")) ;5.3 MiB of HTML docs + (build-system gnu-build-system) + (arguments `(;; FIXME: Disable tests on i686 to work around ;; . #:tests? ,(or (%current-target-system) @@ -204,30 +204,28 @@ (string-append match "9"))))) (add-after 'unpack 'disable-unusable-tests (lambda _ - (substitute* "tests/Makefile.include" + (substitute* "tests/meson.build" ;; Comment out the test-qga test, which needs /sys and ;; fails within the build environment. - (("check-unit-.* tests/test-qga" all) + (("tests.*test-qga.*$" all) (string-append "# " all)) ;; Comment out the test-char test, which needs networking a= nd ;; fails within the build environment. - (("check-unit-.* tests/test-char" all) - (string-append "# " all))) - (substitute* "tests/qtest/Makefile.include" - ;; Disable the following test, which triggers a crash on so= me - ;; x86 CPUs (see https://issues.guix.info/43048 and - ;; https://bugs.launchpad.net/qemu/+bug/1896263). - (("check-qtest-i386-y \\+=3D bios-tables-test" all) + (("'test-char':.*$" all) (string-append "# " all))) #t)) - (add-after 'patch-source-shebangs 'patch-/bin/sh-references + (add-after 'patch-source-shebangs 'patch-embedded-shebangs (lambda _ ;; Ensure the executables created by these source files refer= ence ;; /bin/sh from the store so they work inside the build conta= iner. (substitute* '("block/cloop.c" "migration/exec.c" "net/tap.c" "tests/qtest/libqtest.c") (("/bin/sh") (which "sh"))) + (substitute* "tests/qemu-iotests/check" + (("#!/usr/bin/env python3") + (string-append "#!" (which "python3")))) #t)) + ;; XXX ./configure is being re-run at beginning of build phase... (replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) @@ -236,14 +234,9 @@ (let ((out (assoc-ref outputs "out"))) (setenv "SHELL" (which "bash")) =20 - ;; While we're at it, patch for tests. - (substitute* "tests/qemu-iotests/check" - (("#!/usr/bin/env python3") - (string-append "#!" (which "python3")))) - ;; Ensure config.status gets the correct shebang off the ba= t. ;; The build system gets confused if we change it later and - ;; attempts to re-run the whole configury, and fails. + ;; attempts to re-run the whole configuration, and fails. (substitute* "configure" (("#!/bin/sh") (string-append "#!" (which "sh")))) @@ -318,6 +311,7 @@ exec smbd $@"))) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("python-sphinx" ,python-sphinx) + ("ninja" ,ninja) ("texinfo" ,texinfo))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") --=20 2.30.1 --BeWefNLPnXxbq7RF-- --O4N/iBR+0SRGX8mf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmA5xcYACgkQJkb6MLrK fwjZxg//fudLCmJWOUbnic13IMXcI/j0SE+IFczYfqCE6RoiM66q0i1uQI5dDtdU lIs9eXzvgGbO4+t42V8P5wdaYb/0ju/tV8QdglSz1nIgSyj9LdalRD3lO750uLjj 3lvat4+tHp2/KCMLZuiHQipQK1TF14egwAGeE/vgDxKt5NNw2iwn/Nm2rHzS8SlN lZqhCB4gkrhR3jw+6ItmlqHjH34xVWFRsFA4EpNNQYP2SiOQLrD0RhAqdcJ8XTQA a9yR4/Z6vwQT194LQE6ar39mi3nv9AgfyM4MbwLWe/WKIIELzuF3waryUfScn0aV 8Hl4CASk3CDKtpYxT696hdaPfkmk4l5jduPUs5nhqS6243SjNd3/Re+C2rz8MxC3 7wsMTwXaIXz9bUhlb2oHo9I+VJoa/qVJVLle8lDrMyuLJoAj2MipsL0QTozquuiy XW/l4pmqZoM5AvyXywYTpcMONEEM/u6oEc9YGub75arpRz+MZ/3fNhNWOGnXhQJl dvb0Yz1dRDSwoXcreQlukEWorpT09P0w7JSFcYSl8rSwLGMguLPkOAm2JQY0q/ik ZfxcYzOXht616Po+PQSc0KyoFu+SvZdA6tLLkNX94QWVu8aHmkc/00HAQgTLMf6d Q7tMrMaWVmK5Oo52hD0vjBLJvfC7LwuvWcaKoP6d3ur2fsh4JuI= =IMUX -----END PGP SIGNATURE----- --O4N/iBR+0SRGX8mf-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 15 22:05:13 2021 Received: (at control) by debbugs.gnu.org; 16 Jul 2021 02:05:13 +0000 Received: from localhost ([127.0.0.1]:50159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4DE1-0004W3-Jl for submit@debbugs.gnu.org; Thu, 15 Jul 2021 22:05:13 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:41961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4DE0-0004Vn-Oy for control@debbugs.gnu.org; Thu, 15 Jul 2021 22:05:13 -0400 Received: by mail-qv1-f48.google.com with SMTP id m13so615072qvh.8 for ; Thu, 15 Jul 2021 19:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=pM5xRVi3Svfd2I0YkK1NlS4XsrP0icZcQ5kDorW6YQc=; b=j0wfFUJGBkNLxdSuu7fwKWRoVqHk4FRNUgvjWtljoW/cj5dG3nF1nFgKBKFkMhy1bE 8pbt/X8MVRjk+SIBG7OFUJMKezGqRglesKBVwwaO18uuUaHYRWg1lPms1uHRh0J804XV enwi9NJbdtmFDxrTKTC+qeai1gNVYVSpx0YK+39yDjlfuREUIrS4EZs+skWIDrbSsEZI 4lWwDQ93moe0HpyeNTbggj4LctkPyUuENDfWH+AyE8xD6Xon/8QgB0GyD1qbJB64xLOv XZjUDVVqQb5eZigCeI44ZRbcSsHhrrrOZZ1znrjirOxfmpJagQt5FHc5pBh3zqElRXhw u9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=pM5xRVi3Svfd2I0YkK1NlS4XsrP0icZcQ5kDorW6YQc=; b=dLRdPjZQjHpJzB8XklJXpCBGs9vXBsDllYWUF38lKFqI2csp2242HZyhJXiGnlnuAr sbyZOnuSZXZLZrNGIb8yAQByZxPJWvOMHbqOWQ0T+Dzj1JJSkD//6eZlaf8/rmLePYd2 SwepkGApLsH0wSAAyMZ9Wzpy28bYb8pLH/YbsCtZelL/jvolwPjX4t6hE4Z2P4UYLD1t 2p25BG+aHn9gOCq6B7y31+8PTW87Jts1v5/stempsgmSUbADlhKc5fn4aLWr8RwbZtGb a5Vd9O2IxgJd/ydgUUyZrXFSiF1sLrXg7II7uZEV4/lVtlbLmlIDjWBEcBMiB8Cwce4U r3Pg== X-Gm-Message-State: AOAM530xmsGSIQBruVBu8zl6AYJ4d8RgI3bCq2dbAWFdiOP5GrSpXLp9 Dy0hHOiguWahpwOsey3Zy0oV9/tZ87DaSw== X-Google-Smtp-Source: ABdhPJzd/UQub3fpVb9b697nJi+Ml/FlxVZ8MnMuiTfr4UsJpItV+ipatrK/b/FFEIUSEq5RIc8ngA== X-Received: by 2002:a05:6214:1c1:: with SMTP id c1mr7671914qvt.37.1626401107283; Thu, 15 Jul 2021 19:05:07 -0700 (PDT) Received: from hurd (dsl-159-138.b2b2c.ca. [66.158.159.138]) by smtp.gmail.com with ESMTPSA id z23sm744510qts.96.2021.07.15.19.05.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jul 2021 19:05:07 -0700 (PDT) Date: Thu, 15 Jul 2021 22:05:06 -0400 Message-Id: <87mtqnm2st.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #45014 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 45014 quit From unknown Thu Aug 14 17:30:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 13 Aug 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator