From patchwork Thu Aug 31 04:45:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53334 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 476E727BBEA; Thu, 31 Aug 2023 05:47:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F47627BBE2 for ; Thu, 31 Aug 2023 05:47:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZa4-00023l-D4; Thu, 31 Aug 2023 00:46:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZa2-00022Z-H0 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZa2-000351-91 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZaA-0000ow-62 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65645] [PATCH 1/3] gnu: qemu: Update to 7.2.4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65645 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65645@debbugs.gnu.org, maxim.cournoyer@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.16934571673049 (code B ref -1); Thu, 31 Aug 2023 04:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 04:46:07 +0000 Received: from localhost ([127.0.0.1]:54558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZG-0000n4-ON for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZB-0000mX-Tr for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZYy-0001pQ-9W for guix-patches@gnu.org; Thu, 31 Aug 2023 00:45:48 -0400 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZYu-0002uF-ME for guix-patches@gnu.org; Thu, 31 Aug 2023 00:45:47 -0400 Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-40a9918ec08so2697521cf.0 for ; Wed, 30 Aug 2023 21:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693457142; x=1694061942; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3ujtghmPGwxYGYOmmuuXwSYQ2mpKqWsRsQMJ5WP/Utg=; b=o3Hz6KC5fJGIMomIqBmjbNp3vbI+Xh83LcsyfvPkRjtKRFCYaWQhSTlRzd0Wu2fI+6 rv2Y0HKRrL/x0QkWGhynA4eHDaCZ0h3uMgPSUzZ/kgZuhdJ2h53290OSYM9i47oElGwS nDF9beV2w1I5ZPYLNkcXK+DudtsJF0kN3YmJx7kdytxMW4GFqE8SC1Yd6wqNb5efBrj7 9EAhULQNJR4QYDraTrpMCVV+cWIqmS7AdyyftOEqyYLSuGC18LYPrOLKEItlut2cxfZ1 Liub5PNPdG7r5+zDydv3xhlfZla95jHsh0+nyBQALnOWLcb9zhUghdo5mxuMfi5/eMfy CKrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693457142; x=1694061942; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3ujtghmPGwxYGYOmmuuXwSYQ2mpKqWsRsQMJ5WP/Utg=; b=IliCsJv4BrIdodjslM9uPXL/xRY1rI5nERN+ajV85CBf+VLNJ/Qz7OYviX/5DBCkV7 p6hMYcOksWGy6YwUn/XUbG/EURxyIS6F4YAbmoeyxs6wcuAyoNcnDaXiMkHt97nnqWGu dt+WbAuFQwgYJfRgY1vmseFtXoVstNv6YHebJLKOHS7f74ZZkf+2oVhh4DjbyVHvn892 uVocvtwfKVRDq8vA/qWcnOSTUNMkpMEnUPeoRcivW5n+tsritDgUgUsvrWLjO9WcymcQ 1BIyQtR+HFfgxljHnfzP/taJDmc77jw5PpLkQn5fyoq2nZEpdS8tTA01wFZWR/xGfIFa Bx5A== X-Gm-Message-State: AOJu0Yy8QIu92AALuPM272FLFKaxvKbGhUZExQmMrd2epd4ivxmi6R5g OG6JkjMGEA5WWrgU99sIUtkuGqX64P8= X-Google-Smtp-Source: AGHT+IEPqUEeNiI1QofJlvtTq8SYckRLp5aEaIItI0KJuP5w8BFLg+fURbyBrJeVWs73tmkQ20hvaA== X-Received: by 2002:a0c:b701:0:b0:63d:7214:638e with SMTP id t1-20020a0cb701000000b0063d7214638emr1659836qvd.56.1693457141743; Wed, 30 Aug 2023 21:45:41 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-23.b2b2c.ca. [72.10.128.23]) by smtp.gmail.com with ESMTPSA id p17-20020a0ce191000000b0064f4d3bc78csm277003qvl.61.2023.08.30.21.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:45:41 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 31 Aug 2023 00:45:26 -0400 Message-ID: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (qemu): Update to 7.2.4. [source] : Replace qemu-disable-aarch64-migration-test.patch with qemu-disable-some-qtests-tests.patch. : Adjust for dtc relocation and meson and sgabios removal. [arguments] : Remove --meson flag. Remove sgabios from the --firmwarepath value. : Adjust replace-firmwares and delete-firmwares phases for sgabios removal. [inputs]: Remove sgabios. (qemu-minimal): Use package/inherit, which is more appropriate for a package variant. [arguments]: New disable-extra-tests phase. * gnu/packages/patches/qemu-disable-aarch64-migration-test.patch: Delete file. * gnu/packages/patches/qemu-disable-some-qtests-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- .../qemu-disable-aarch64-migration-test.patch | 13 ----- .../qemu-disable-some-qtests-tests.patch | 52 +++++++++++++++++++ gnu/packages/virtualization.scm | 43 +++++++-------- 4 files changed, 71 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/qemu-disable-aarch64-migration-test.patch create mode 100644 gnu/packages/patches/qemu-disable-some-qtests-tests.patch base-commit: d6966b8a5b4f2ddda2bc685b9642e7a1c2cbe17c diff --git a/gnu/local.mk b/gnu/local.mk index 48187d7e64..0683a87492 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1864,7 +1864,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-werkzeug-tests.patch \ %D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ - %D%/packages/patches/qemu-disable-aarch64-migration-test.patch \ + %D%/packages/patches/qemu-disable-some-qtests-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \ diff --git a/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch b/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch deleted file mode 100644 index bf60ed23bb..0000000000 --- a/gnu/packages/patches/qemu-disable-aarch64-migration-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -Disable the qtest-aarch64/migration-test, which sometimes fail non-deterministically. -See: https://gitlab.com/qemu-project/qemu/-/issues/1230. - ---- qemu-7.1.0/tests/qtest/meson.build.old 1969-12-31 19:00:01.000000000 -0500 -+++ qemu-7.1.0/tests/qtest/meson.build 2022-09-26 11:11:05.434209797 -0400 -@@ -219,7 +219,6 @@ - ['arm-cpu-features', - 'numa-test', - 'boot-serial-test', -- 'migration-test', - 'bcm2835-dma-test'] - - qtests_s390x = \ diff --git a/gnu/packages/patches/qemu-disable-some-qtests-tests.patch b/gnu/packages/patches/qemu-disable-some-qtests-tests.patch new file mode 100644 index 0000000000..f60698de8f --- /dev/null +++ b/gnu/packages/patches/qemu-disable-some-qtests-tests.patch @@ -0,0 +1,52 @@ +Disable the qtest-aarch64/migration-test, which sometimes fail +non-deterministically (see: +https://gitlab.com/qemu-project/qemu/-/issues/1230). + +Also disable the bios-tables-test, which may fail on older machines (see: +https://gitlab.com/qemu-project/qemu/-/issues/1098). + +--- qemu-8.1.0/tests/qtest/meson.build.old 2023-08-30 11:48:27.871146249 -0400 ++++ qemu-8.1.0/tests/qtest/meson.build 2023-08-30 13:53:25.994084948 -0400 +@@ -1,6 +1,5 @@ + slow_qtests = { + 'ahci-test' : 60, +- 'bios-tables-test' : 120, + 'boot-serial-test' : 60, + 'migration-test' : 150, + 'npcm7xx_pwm-test': 150, +@@ -81,9 +80,6 @@ + config_all_devices.has_key('CONFIG_Q35') and \ + config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \ + slirp.found() ? ['virtio-net-failover'] : []) + \ +- (unpack_edk2_blobs and \ +- config_all_devices.has_key('CONFIG_HPET') and \ +- config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \ + qtests_pci + \ + qtests_cxl + \ + ['fdc-test', +@@ -212,7 +208,6 @@ + + # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional + qtests_aarch64 = \ +- (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \ + (config_all.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ + ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ + (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ +@@ -222,8 +217,7 @@ + config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ + ['arm-cpu-features', + 'numa-test', +- 'boot-serial-test', +- 'migration-test'] ++ 'boot-serial-test'] + + qtests_s390x = \ + qtests_filter + \ +@@ -301,7 +295,6 @@ + endif + + qtests = { +- 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'], + 'cdrom-test': files('boot-sector.c'), + 'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1, + 'erst-test': files('erst-test.c'), diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9952dd125a..4ae0049269 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020, 2021, 2022 Marius Bakke -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021, 2022 Pierre Langlois @@ -164,16 +164,15 @@ (define (qemu-patch commit file-name sha256-bv) (define-public qemu (package (name "qemu") - (version "7.2.4") + (version "8.1.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 - (base32 "0795l8xsy67fnh4mbdz40jm880iisd7q6d7ly6nfzpac3gjr8zyf")) - (patches (search-patches "qemu-build-info-manual.patch" - "qemu-disable-aarch64-migration-test.patch" + (base32 "0m8fbyr3xv6gi95ma0sksxfqmyj3pi4zcrgg5rvd8d73k08i033i")) + (patches (search-patches "qemu-disable-some-qtests-tests.patch" "qemu-fix-agent-paths.patch")) (modules '((guix build utils))) (snippet @@ -182,8 +181,6 @@ (define-public qemu (with-directory-excursion "pc-bios" ;; Delete firmwares provided by SeaBIOS. (for-each delete-file (find-files "." "^(bios|vgabios).*\\.bin$")) - ;; Delete SGABIOS. - (delete-file "sgabios.bin") ;; Delete ppc64 OpenBIOS. TODO: Remove sparc32 and sparc64 too ;; once they are supported in Guix. (delete-file "openbios-ppc") @@ -194,12 +191,11 @@ (define-public qemu (for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$"))) ;; Delete bundled code that we provide externally. (for-each delete-file-recursively - '("dtc" "meson" + '("subprojects/dtc" "roms/ipxe" "roms/openbios" "roms/opensbi" - "roms/seabios" - "roms/sgabios")))))) + "roms/seabios")))))) (outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs (build-system gnu-build-system) (arguments @@ -210,7 +206,6 @@ (define-public qemu (not (string=? "i686-linux" (%current-system)))) #:configure-flags #~(let ((gcc (search-input-file %build-inputs "/bin/gcc")) - (meson (search-input-file %build-inputs "bin/meson")) (openbios (search-input-file %build-inputs "share/qemu/openbios-ppc")) (opensbi (search-input-file @@ -218,25 +213,20 @@ (define-public qemu "share/qemu/opensbi-riscv64-generic-fw_dynamic.bin")) (seabios (search-input-file %build-inputs "share/qemu/bios.bin")) - (sgabios (search-input-file %build-inputs - "/share/qemu/sgabios.bin")) (ipxe (search-input-file %build-inputs "share/qemu/pxe-virtio.rom")) (out #$output)) (list (string-append "--cc=" gcc) ;; Some architectures insist on using HOST_CC. (string-append "--host-cc=" gcc) - (string-append "--meson=" meson) (string-append "--prefix=" out) - "--sysconfdir=/etc" "--enable-fdt=system" (string-append "--firmwarepath=" out "/share/qemu:" (dirname seabios) ":" (dirname ipxe) ":" (dirname openbios) ":" - (dirname opensbi) ":" - (dirname sgabios)) + (dirname opensbi)) (string-append "--smbd=" out "/libexec/samba-wrapper") "--disable-debug-info" ;for space considerations ;; The binaries need to be linked against -lrt. @@ -257,7 +247,6 @@ (define-public qemu (let* ((seabios (dirname (search-input-file inputs "share/qemu/bios.bin"))) (seabios-firmwares (find-files seabios "\\.bin$")) - (sgabios (search-input-file inputs "share/qemu/sgabios.bin")) (ipxe (dirname (search-input-file inputs "share/qemu/pxe-virtio.rom"))) (ipxe-firmwares (find-files ipxe "\\.rom$")) @@ -282,7 +271,7 @@ (define-public qemu (for-each (lambda (file) (symlink file (basename file))) (append seabios-firmwares ipxe-firmwares - (list openbios opensbi-riscv64 sgabios)))) + (list openbios opensbi-riscv64)))) (for-each (lambda (file) (format allowed-differences-whitelist "\"~a\",~%" file)) @@ -405,8 +394,7 @@ (define-public qemu (for-each delete-file (append '("openbios-ppc" - "opensbi-riscv64-generic-fw_dynamic.bin" - "sgabios.bin") + "opensbi-riscv64-generic-fw_dynamic.bin") (find-files "." "^(vga)?bios(-[a-z0-9-]+)?\\.bin$") (find-files "." "^(efi|pxe)-.*\\.rom$")))))) ;; Create a wrapper for Samba. This allows QEMU to use Samba without @@ -457,7 +445,6 @@ (define-public qemu pulseaudio sdl2 seabios-qemu - sgabios spice usbredir util-linux @@ -512,8 +499,7 @@ (define-public qemu (define-public qemu-minimal ;; QEMU without GUI support, only supporting the host's architecture - (package - (inherit qemu) + (package/inherit qemu (name "qemu-minimal") (outputs '("out" "doc")) (synopsis @@ -556,7 +542,14 @@ (define-public qemu-minimal #~(modify-phases #$phases (delete 'configure-user-static) (delete 'build-user-static) - (delete 'install-user-static))))) + (delete 'install-user-static) + (add-after 'disable-unusable-tests 'disable-extra-tests + (lambda _ + ;; Interesting, the iothreads-commit-active test only fails in + ;; qemu-minimal, not the complete variant (see: + ;; https://gitlab.com/qemu-project/qemu/-/issues/1855). + (delete-file + "tests/qemu-iotests/tests/iothreads-commit-active"))))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (filter (lambda (input) From patchwork Thu Aug 31 04:45:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53333 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B54F227BBE9; Thu, 31 Aug 2023 05:47:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 905DF27BBE2 for ; Thu, 31 Aug 2023 05:47:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZa5-00024J-EN; Thu, 31 Aug 2023 00:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZa3-00023C-Of for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZa3-000359-42 for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZaB-0000pB-0u for guix-patches@gnu.org; Thu, 31 Aug 2023 00:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65646] [PATCH 2/3] gnu: aalib: Really build the shared library on powerpc64le-linux. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65646 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65646@debbugs.gnu.org, maxim.cournoyer@gmail.com Cc: Marcel van der Boom X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.16934571833088 (code B ref -1); Thu, 31 Aug 2023 04:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 04:46:23 +0000 Received: from localhost ([127.0.0.1]:54561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZW-0000nk-LG for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZT-0000nU-B5 for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZZF-0001st-TT for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:05 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZZC-00030b-5J for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:05 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-76f14d80ea6so24955485a.2 for ; Wed, 30 Aug 2023 21:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693457161; x=1694061961; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6pYc+TieB/ja9cyZ0VqfIQarfNzVdLrku1htNKeLp9o=; b=M3HXp6iJLNl/CrPnm2nQENObP1gTQmVrg5nNKL2eBAYyG/Nhu6o2Pu5N03osPBMshV X9mZxDfw4QVIyas9zrlYVP62ZEj8zSj/PxCidZxyepl2jbsXlZiRevY9MtEDT1pNnClM e2AqKts0MBjuravg1fDo8f/TACvOs3Vrpw86Hw8SAdotVgyC7L5sUrm/MeemcdhJQcuk 4JWCCU0oVYcjfJFV7m3K/cm3BRHqpZI3o2XlrCEJWRgzg9rxKGPkAFBrzHiPlStT8JgX vpRA6O/lzEkCaBbc7uxydMXBJaWWS6od96pkot5WaBDuVziwD+hxKVW70av8EJaGskOj MPTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693457161; x=1694061961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pYc+TieB/ja9cyZ0VqfIQarfNzVdLrku1htNKeLp9o=; b=fpInDejtVEe8PaBoAjJBpAvXaEqETOzFT/630eqfMTKXOfM5uRxNlgMcNie3UcTxjM 1cG7+zNTTW3d7Ls1E1eGrVPRSEQJkje4u6+TTS3YsfncYgL3g4Sjd+kwhln1sYIqv8aF n5/bmNus9Z537ZGV6kV8QcLIhVOyON/4zA7eUoqJTAP3TW7m1wzvAu6av6wneLpA/foL KiEi55XkMWtaCECvtU07HVNAL4IOe5B6yOB8S4c8LxdMwlRUkg2/NXzkcpFXaIYW1J1Z h+G0C9J1DCv2gJOACnNQmRpbhxpznmylnNTOj4PYxQqmutw35agu3zk0eoQDY58pjNTY P5rw== X-Gm-Message-State: AOJu0YzooFuBukIYSajshXE5DbtCDLfNVRb7LT0RIE1w2vPwL04ceqIw kXyBu0pMxXJP6vgzV+xf4iJ6rwaVtPo= X-Google-Smtp-Source: AGHT+IGZvUNSEFAzNvW3VVLPEax5DF8AUnHoWZiIz8h0M/dnp1mnRgNqx00M1jViO642u/S+ewXYUw== X-Received: by 2002:a05:620a:44d1:b0:767:f49c:1d67 with SMTP id y17-20020a05620a44d100b00767f49c1d67mr2092668qkp.1.1693457161015; Wed, 30 Aug 2023 21:46:01 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-23.b2b2c.ca. [72.10.128.23]) by smtp.gmail.com with ESMTPSA id p17-20020a0ce191000000b0064f4d3bc78csm277003qvl.61.2023.08.30.21.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:46:00 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 31 Aug 2023 00:45:27 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> References: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes . The old build scripts were buggy and causing a static library to be produced instead, which would fail to be linked by gst-plugins-good. * gnu/packages/video.scm (aalib) [native-inputs]: Remove labels. [arguments]: Use gexps. : New argument. : Remove update-config-scripts and configure override. Add force-autoreconf. Reported-by: Marcel van der Boom --- gnu/packages/video.scm | 43 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ff52b9b38d..1a0880bf3c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -50,7 +50,7 @@ ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021, 2022, 2023 Andrew Tropin ;;; Copyright © 2021 David Wilson -;;; Copyright © 2021,2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Thiago Jung Bauermann @@ -745,36 +745,19 @@ (define-public aalib (base32 "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv")))) (build-system gnu-build-system) - (native-inputs - `(("config" ,config) - ("makeinfo" ,texinfo))) - (inputs - (list ncurses)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'update-config-scripts - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Replace outdated config.guess and config.sub. - (for-each (lambda (file) - (install-file - (search-input-file - (or native-inputs inputs) - (string-append "/bin/" file)) ".")) - '("config.guess" "config.sub")))) - (replace 'configure - (lambda* (#:key build inputs outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out")) - (ncurses (assoc-ref inputs "ncurses"))) - (setenv "CONFIG_SHELL" (which "bash")) - (invoke "./configure" - "--disable-static" - (string-append "--prefix=" out) - (string-append "--build=" build) - (string-append "--with-ncurses=" - ncurses)))))))) + (list + #:configure-flags + #~(list "--disable-static" + (string-append "--with-ncurses=" + #$(this-package-input "ncurses"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'force-autoreconf + (lambda _ + (delete-file "configure")))))) + (native-inputs (list autoconf automake libtool texinfo)) + (inputs (list ncurses)) (home-page "https://aa-project.sourceforge.net/aalib/") (synopsis "ASCII-art library") (description From patchwork Thu Aug 31 04:45:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53335 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4139627BBEA; Thu, 31 Aug 2023 05:47:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B55C27BBE2 for ; Thu, 31 Aug 2023 05:47:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZa6-00025R-TL; Thu, 31 Aug 2023 00:46:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZa5-00024c-LW for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZa5-00035S-DT for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZaB-0000pQ-PL; Thu, 31 Aug 2023 00:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65647] [PATCH 3/3] gnu: edk2-tools: Update to 202308. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65647@debbugs.gnu.org, maxim.cournoyer@gmail.com Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by submit@debbugs.gnu.org id=B.16934571873105 (code B ref -1); Thu, 31 Aug 2023 04:47:03 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 04:46:27 +0000 Received: from localhost ([127.0.0.1]:54564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZb-0000o1-6M for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZZY-0000nZ-8m for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:46:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbZZK-0001uA-Si for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:10 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZZI-000316-9H for guix-patches@gnu.org; Thu, 31 Aug 2023 00:46:10 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-76da1331db9so71077385a.0 for ; Wed, 30 Aug 2023 21:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693457167; x=1694061967; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ufrSVhuONN16KZqKSNNkRbpxwok9hD0q4+09aFkW1MM=; b=hd71RSzo84IsshezmBdpYR7CYtysalw4wiRrlQ49feYQnpp6KCqfGyPd5pN0CPtQT/ z9ivkCO8Jo6uAxwFLvNb/xkvYJpurs8B30CauBUK3QpYil20ClYdf/dlzW20NmqPdg2v rrHHBNQKE4DiKi444Oer3keOKln8JaRgJLq/BrhT81BMgoYvzVVVOrFAFZb4hn9SZNg5 XnuOZoU1Xc83YlpHDzuMGiFHWtcYmU9G+Po9tjETbGYZR8zFWrEO6a0xtX1wnLwpnXfJ UU4lDd2MYsHdCvDgOYHtB94ir0mk7nEgugaMWMj/vVHEXfj4I6ytH/Y/tVW5mPNdBokJ rDDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693457167; x=1694061967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ufrSVhuONN16KZqKSNNkRbpxwok9hD0q4+09aFkW1MM=; b=edpcNyvKc47HOqevGD0EaWlk0YapZbc/xUurXJNENI7fNRYC+TUSepaxDBboOGoY8V ia1okSkLss9HaH0CaWu7rxG9oHKYA0Op6ZngG3f8orUDfk+/k71Pegkif92e1otEzOkS O1QXHin5Re78LV/IMOeucQ3/AtPWccCwa4KhaEaui2i3IaSdN48HJjMx15u2LG6EKMNi kxl1IC7a37hA9VGBOtG10KH6YIJWzW3Mywty3Od2wEYZQkfBHqUzyJiWeUxi/1N4dWUC LsihAykrcJuRBOcsUA5+a0Nb5b92JW9htIj7L//kuwhPt+7b/MCpnfBjPCdlmjHVzrXV GvQw== X-Gm-Message-State: AOJu0YyY+tkHFmg3qeCSWfHTxH6aNB7vQC4f9I2Np2kI7VZncCrQA0Th i+78t8WJN18KYxIvnW4BjSOFqIpU0P8= X-Google-Smtp-Source: AGHT+IG4DHlcZFeaaBqex624kOdJRawzMbEtxnWhSqc+Itio9qyzSPydxiJ0uasu/9i2B0BtY5O8kA== X-Received: by 2002:a0c:f5c9:0:b0:64f:3c70:349a with SMTP id q9-20020a0cf5c9000000b0064f3c70349amr2170542qvm.19.1693457166800; Wed, 30 Aug 2023 21:46:06 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-23.b2b2c.ca. [72.10.128.23]) by smtp.gmail.com with ESMTPSA id p17-20020a0ce191000000b0064f4d3bc78csm277003qvl.61.2023.08.30.21.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:46:06 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 31 Aug 2023 00:45:28 -0400 Message-ID: <077b5c99bcb352267cb9750c0053834d4dcc34c2.1693457128.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> References: <9e32eeeef4dbc36eb02098925f7567b4cce50363.1693457127.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (edk2-tools): Update to 202308. [arguments] : Add CC. --- gnu/packages/firmware.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 2e2c4af796..94ec5e71a1 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -800,7 +800,7 @@ (define-public sgabios (define-public edk2-tools (package (name "edk2-tools") - (version "202211") + (version "202308") (source (origin (method git-fetch) (uri (git-reference @@ -809,11 +809,12 @@ (define-public edk2-tools (file-name (git-file-name name version)) (sha256 (base32 - "1264542mm0mffjcmw5sw34h94n405swz5z56rw1ragp3j62144iy")))) + "19g3g94hayvcwmn6sjs6mghq0qf5nsd785k5j8szcrj2p0vjh54f")))) (build-system gnu-build-system) (arguments (list #:make-flags - #~(list (string-append "BUILD_CC=" #$(cc-for-target))) + #~(list (string-append "BUILD_CC=" #$(cc-for-target)) + (string-append "CC=" #$(cc-for-target))) #:test-target "Tests" #:phases #~(modify-phases %standard-phases