From patchwork Sat Jun 15 18:23:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 45176 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67DDCC3DA52 for ; Sat, 15 Jun 2024 18:23:29 +0000 (UTC) Received: from a27-45.smtp-out.us-west-2.amazonses.com (a27-45.smtp-out.us-west-2.amazonses.com [54.240.27.45]) by mx.groups.io with SMTP id smtpd.web11.18383.1718475799799717667 for ; Sat, 15 Jun 2024 11:23:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=M2T9Sz65; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=rIS511Pa; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.45, mailfrom: 010101901d23ba2a-5cbaa1f8-eee9-486d-a28f-803187a1627e-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1718475799; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=kL3CybEK5jueH1W3gIJxidXZt1T3OnmpZZSl0Yar5aw=; b=M2T9Sz65NUs+Dyg0PfGvqE3BYwK7XFDAPTbbNFeg04TFDl7JDeCcNFu5QWo7GTrZ JhxkkwDjYpsub6/OcXxR/WcdLr7xnAis1Nb1zYkBQJR16DPBtIvgPrXMSxg/MTHKGD8 XMXHRdY/Q4HkmhBbsbW5U7aRocPUrPogqQjGhFTc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1718475799; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=kL3CybEK5jueH1W3gIJxidXZt1T3OnmpZZSl0Yar5aw=; b=rIS511PavwnbfjsaHRvLZrHDiqK3I1yxvx8DFId9sfHL0llBAxl4WqKVmmNFNYuh cGqMNY9ZzMP3cx/cVsX07izdiCfvEUi5RLq+LOBkN2A4TtCPzXgNwmDAtYn6nxIAvbz kYhiX4EWmNY/EHd+KdWsgQe5eE3DmvopFOYZ+nLI= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] qemu: upgrading to 9.0.1 FAILED Message-ID: <010101901d23ba2a-5cbaa1f8-eee9-486d-a28f-803187a1627e-000000@us-west-2.amazonses.com> Date: Sat, 15 Jun 2024 18:23:19 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.06.15-54.240.27.45 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 15 Jun 2024 18:23:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200709 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *qemu* to *9.0.1* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-qemu-upgrade-9.0.0-9.0.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From f3f47968f67c161ad2c9ca1b6c0299d8312f88da Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 15 Jun 2024 10:13:53 +0000 Subject: [PATCH] qemu: upgrade 9.0.0 -> 9.0.1 --- meta/recipes-devtools/qemu/qemu.inc | 2 +- ...n-environment-space-to-boot-loader-q.patch | 9 ++-- .../0002-apic-fixup-fallthrough-to-PIC.patch | 9 ++-- ...dd-pkg-config-handling-for-libgcrypt.patch | 9 ++-- ...mu-Do-not-include-file-if-not-exists.patch | 9 ++-- ...er-space-mmap-tweaks-to-address-musl.patch | 10 ++-- .../qemu/0006-qemu-Determinism-fixes.patch | 9 ++-- ...d-use-relative-path-to-refer-to-file.patch | 9 ++-- ...and-MAP_SHARED_VALIDATE-on-needed-li.patch | 9 ++-- ...ce-use-of-lfs64-related-functions-an.patch | 54 +++++++++---------- ...gure-lookup-meson-exutable-from-PATH.patch | 11 ++-- ...and-the-python-venv-aren-t-used-for-.patch | 12 ++--- .../qemu/{qemu_9.0.0.bb => qemu_9.0.1.bb} | 0 13 files changed, 58 insertions(+), 94 deletions(-) rename meta/recipes-devtools/qemu/{qemu_9.0.0.bb => qemu_9.0.1.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index fb38fb44de..6a5ab56436 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -37,7 +37,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "32708ac66c30d8c892633ea968c771c1c76d597d70ddead21a0d22ccf386da69" +SRC_URI[sha256sum] = "d0f4db0fbd151c0cf16f84aeb2a500f6e95009732546f44dafab8d2049bbb805" CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 2333cc8432..5318cacff5 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,7 +1,7 @@ -From e9baf07a667a1c04b57e14776cc4fa387448c908 Mon Sep 17 00:00:00 2001 +From f88d114872c286ffe98be3ac303ae6affc570444 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 -Subject: [PATCH 01/11] qemu: Add addition environment space to boot loader +Subject: [PATCH] qemu: Add addition environment space to boot loader qemu-system-mips Upstream-Status: Inappropriate - OE uses deep paths @@ -18,7 +18,7 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c -index af74008c82..a588b9ad4e 100644 +index af74008c8..a588b9ad4 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -63,7 +63,7 @@ @@ -30,6 +30,3 @@ index af74008c82..a588b9ad4e 100644 /* Hardware addresses */ #define FLASH_ADDRESS 0x1e000000ULL --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch index 5f8fe4faa3..21811fd5e5 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch @@ -1,7 +1,7 @@ -From 23bf534e463bf4c1ba2e1356eaf17be0b23b192e Mon Sep 17 00:00:00 2001 +From 2664e04ec625a7be97ba1f84a6e79dea121a860e Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 -Subject: [PATCH 02/11] apic: fixup fallthrough to PIC +Subject: [PATCH] apic: fixup fallthrough to PIC Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC interrupts through the local APIC if the local APIC config says so.] @@ -29,7 +29,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index 4186c57b34..43cd805a96 100644 +index 4186c57b3..43cd805a9 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -759,7 +759,7 @@ int apic_accept_pic_intr(DeviceState *dev) @@ -41,6 +41,3 @@ index 4186c57b34..43cd805a96 100644 return -1; lvt0 = s->lvt[APIC_LVT_LINT0]; --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch index 30e269f8f4..29c655ae5c 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From e4f6c6b9f43b28271bc9dc6cbcafad53f80387e0 Mon Sep 17 00:00:00 2001 +From 5c99cc634339a0ecc7b1c03b269f73b02bfb77be Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [PATCH 03/11] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -14,7 +14,7 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 91a0aa64c6..e8373d55b8 100644 +index 91a0aa64c..e8373d55b 100644 --- a/meson.build +++ b/meson.build @@ -1655,7 +1655,7 @@ endif @@ -26,6 +26,3 @@ index 91a0aa64c6..e8373d55b8 100644 required: get_option('gcrypt')) # Debian has removed -lgpg-error from libgcrypt-config # as it "spreads unnecessary dependencies" which in --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch index d9cab428c4..1cc2a4bad5 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch @@ -1,7 +1,7 @@ -From 5223d46a8d5302396f9fc7cc5d830769e87242fe Mon Sep 17 00:00:00 2001 +From 8aca988dba777092a95763ac6936c7b91c2d5b79 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy Date: Wed, 25 Mar 2020 21:21:35 +0200 -Subject: [PATCH 04/11] qemu: Do not include file if not exists +Subject: [PATCH] qemu: Do not include file if not exists Script configure checks for if_alg.h and check failed but if_alg.h still included. @@ -16,7 +16,7 @@ Signed-off-by: Sakib Sajal 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 3df2b94d9a..18f09f1f07 100644 +index 59fb3e911..cb651459a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -116,7 +116,9 @@ @@ -29,6 +29,3 @@ index 3df2b94d9a..18f09f1f07 100644 #include #include #ifdef HAVE_BTRFS_H --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch index 3c7f5776ff..b123e17adb 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch @@ -1,8 +1,7 @@ -From 1c295069857b9850f15f2cd6b33b133ea641a454 Mon Sep 17 00:00:00 2001 +From e16a9e040197ecf16c95bbc657ac5be0ba8146ae Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 8 Jan 2021 17:27:06 +0000 -Subject: [PATCH 05/11] qemu: Add some user space mmap tweaks to address musl - 32 bit +Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an infinite loop of mremap calls of ever decreasing/increasing addresses. @@ -23,7 +22,7 @@ Signed-off-by: Richard Purdie Date: Mon, 1 Mar 2021 13:00:47 +0000 -Subject: [PATCH 06/11] qemu: Determinism fixes +Subject: [PATCH] qemu: Determinism fixes When sources are included within debug information, a couple of areas of the qemu build are not reproducible due to either full buildpaths or timestamps. @@ -16,7 +16,7 @@ RP 2021/3/1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py -index e8b72da3a9..5cd86b1428 100644 +index e8b72da3a..5cd86b142 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -1558,7 +1558,7 @@ def main(): @@ -28,6 +28,3 @@ index e8b72da3a9..5cd86b1428 100644 f = open(filename, 'rt', encoding='utf-8') parse_file(f, toppat) f.close() --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch index 74de158b2e..148e581ac8 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch @@ -1,7 +1,7 @@ -From 77ebf67d0c96f51da91c8499200ebd13f4dcdd68 Mon Sep 17 00:00:00 2001 +From c75bd2b66ce38242f7df9e992cceb71ef32e7393 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 14 Jan 2021 06:33:04 +0000 -Subject: [PATCH 07/11] tests/meson.build: use relative path to refer to files +Subject: [PATCH] tests/meson.build: use relative path to refer to files Fix error like: Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long @@ -17,7 +17,7 @@ Signed-off-by: Changqing Li 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build -index 228a21d03c..272fb4c6ca 100644 +index 228a21d03..272fb4c6c 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -47,7 +47,7 @@ tests = { @@ -38,6 +38,3 @@ index 228a21d03c..272fb4c6ca 100644 'test-vmstate': [migration, io], 'test-yank': ['socket-helpers.c', qom, io, chardev] } --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch index 2e28590e11..b48f24fe98 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch @@ -1,7 +1,7 @@ -From 21b159a11bbcb1eeb26f12456e4c3fd62a06cbec Mon Sep 17 00:00:00 2001 +From 5cd8e589c183fe8019a99189c60ea4f147cff34c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 21 Mar 2022 10:09:38 -0700 -Subject: [PATCH 08/11] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux +Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux systems linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures @@ -18,7 +18,7 @@ Cc: Michael S. Tsirkin 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c -index ed14f9c64d..038f5b4b55 100644 +index ed14f9c64..038f5b4b5 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -10,14 +10,18 @@ @@ -43,6 +43,3 @@ index ed14f9c64d..038f5b4b55 100644 #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h" #include "qemu/cutils.h" --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta/recipes-devtools/qemu/qemu/0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch index 7577249d39..1456fdd36b 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch @@ -1,8 +1,7 @@ -From 23de30079dbf47a8026faddd550a9e181d609c8f Mon Sep 17 00:00:00 2001 +From 7c8ec207159bac162fd72f2fb45e8221d6db3a4d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 17 Dec 2022 08:37:46 -0800 -Subject: [PATCH 09/11] linux-user: Replace use of lfs64 related functions and - macros +Subject: [PATCH] linux-user: Replace use of lfs64 related functions and macros Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions anf macros behave same as their 64 suffixed counterparts. This also @@ -17,7 +16,7 @@ Cc: Laurent Vivier 1 file changed, 39 insertions(+), 114 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 18f09f1f07..1b7c50a2a7 100644 +index cb651459a..cb44cc21d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff, @@ -31,7 +30,7 @@ index 18f09f1f07..1b7c50a2a7 100644 * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts. */ #ifdef __NR_fcntl64 -@@ -6739,13 +6739,13 @@ static int target_to_host_fcntl_cmd(int cmd) +@@ -6734,13 +6734,13 @@ static int target_to_host_fcntl_cmd(int cmd) ret = cmd; break; case TARGET_F_GETLK: @@ -48,7 +47,7 @@ index 18f09f1f07..1b7c50a2a7 100644 break; case TARGET_F_GETOWN: ret = F_GETOWN; -@@ -6759,17 +6759,6 @@ static int target_to_host_fcntl_cmd(int cmd) +@@ -6754,17 +6754,6 @@ static int target_to_host_fcntl_cmd(int cmd) case TARGET_F_SETSIG: ret = F_SETSIG; break; @@ -66,7 +65,7 @@ index 18f09f1f07..1b7c50a2a7 100644 case TARGET_F_SETLEASE: ret = F_SETLEASE; break; -@@ -6821,8 +6810,8 @@ static int target_to_host_fcntl_cmd(int cmd) +@@ -6816,8 +6805,8 @@ static int target_to_host_fcntl_cmd(int cmd) * them to 5, 6 and 7 before making the syscall(). Since we make the * syscall directly, adjust to what is supported by the kernel. */ @@ -77,7 +76,7 @@ index 18f09f1f07..1b7c50a2a7 100644 } #endif -@@ -6855,55 +6844,11 @@ static int host_to_target_flock(int type) +@@ -6850,55 +6839,11 @@ static int host_to_target_flock(int type) return type; } @@ -136,7 +135,7 @@ index 18f09f1f07..1b7c50a2a7 100644 abi_short l_type; abi_short l_whence; abi_llong l_start; -@@ -6911,10 +6856,10 @@ struct target_oabi_flock64 { +@@ -6906,10 +6851,10 @@ struct target_oabi_flock64 { abi_int l_pid; } QEMU_PACKED; @@ -149,7 +148,7 @@ index 18f09f1f07..1b7c50a2a7 100644 int l_type; if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { -@@ -6935,10 +6880,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, +@@ -6930,10 +6875,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, return 0; } @@ -163,7 +162,7 @@ index 18f09f1f07..1b7c50a2a7 100644 short l_type; if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { -@@ -6956,10 +6901,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr, +@@ -6951,10 +6896,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr, } #endif @@ -176,7 +175,7 @@ index 18f09f1f07..1b7c50a2a7 100644 int l_type; if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { -@@ -6980,10 +6925,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl, +@@ -6975,10 +6920,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl, return 0; } @@ -190,7 +189,7 @@ index 18f09f1f07..1b7c50a2a7 100644 short l_type; if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { -@@ -7002,7 +6947,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr, +@@ -6997,7 +6942,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr, static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) { @@ -199,7 +198,7 @@ index 18f09f1f07..1b7c50a2a7 100644 #ifdef F_GETOWN_EX struct f_owner_ex fox; struct target_f_owner_ex *target_fox; -@@ -7015,6 +6960,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) +@@ -7010,6 +6955,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) switch(cmd) { case TARGET_F_GETLK: @@ -207,7 +206,7 @@ index 18f09f1f07..1b7c50a2a7 100644 ret = copy_from_user_flock(&fl64, arg); if (ret) { return ret; -@@ -7024,32 +6970,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) +@@ -7019,32 +6965,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) ret = copy_to_user_flock(arg, &fl64); } break; @@ -241,7 +240,7 @@ index 18f09f1f07..1b7c50a2a7 100644 if (ret) { return ret; } -@@ -7278,7 +7203,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1 +@@ -7273,7 +7198,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1 arg2 = arg3; arg3 = arg4; } @@ -250,7 +249,7 @@ index 18f09f1f07..1b7c50a2a7 100644 } #endif -@@ -7292,7 +7217,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1, +@@ -7287,7 +7212,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1, arg2 = arg3; arg3 = arg4; } @@ -259,7 +258,7 @@ index 18f09f1f07..1b7c50a2a7 100644 } #endif -@@ -8667,7 +8592,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8662,7 +8587,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) void *tdirp; int hlen, hoff, toff; int hreclen, treclen; @@ -268,7 +267,7 @@ index 18f09f1f07..1b7c50a2a7 100644 hdirp = g_try_malloc(count); if (!hdirp) { -@@ -8720,7 +8645,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8715,7 +8640,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) * Return what we have, resetting the file pointer to the * location of the first record not returned. */ @@ -277,7 +276,7 @@ index 18f09f1f07..1b7c50a2a7 100644 break; } -@@ -8754,7 +8679,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8749,7 +8674,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) void *tdirp; int hlen, hoff, toff; int hreclen, treclen; @@ -286,7 +285,7 @@ index 18f09f1f07..1b7c50a2a7 100644 hdirp = g_try_malloc(count); if (!hdirp) { -@@ -8796,7 +8721,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8791,7 +8716,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) * Return what we have, resetting the file pointer to the * location of the first record not returned. */ @@ -295,7 +294,7 @@ index 18f09f1f07..1b7c50a2a7 100644 break; } -@@ -11527,7 +11452,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -11522,7 +11447,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return -TARGET_EFAULT; } } @@ -304,7 +303,7 @@ index 18f09f1f07..1b7c50a2a7 100644 unlock_user(p, arg2, ret); return ret; case TARGET_NR_pwrite64: -@@ -11544,7 +11469,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -11539,7 +11464,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return -TARGET_EFAULT; } } @@ -313,7 +312,7 @@ index 18f09f1f07..1b7c50a2a7 100644 unlock_user(p, arg2, 0); return ret; #endif -@@ -12404,14 +12329,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -12399,14 +12324,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, case TARGET_NR_fcntl64: { int cmd; @@ -333,7 +332,7 @@ index 18f09f1f07..1b7c50a2a7 100644 } #endif -@@ -12421,7 +12346,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -12416,7 +12341,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, } switch(arg2) { @@ -342,7 +341,7 @@ index 18f09f1f07..1b7c50a2a7 100644 ret = copyfrom(&fl, arg3); if (ret) { break; -@@ -12432,8 +12357,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -12427,8 +12352,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, } break; @@ -353,6 +352,3 @@ index 18f09f1f07..1b7c50a2a7 100644 ret = copyfrom(&fl, arg3); if (ret) { break; --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch index 98ce85a8cf..632cac6ed4 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch @@ -1,7 +1,7 @@ -From e12a93174f9b652604dda8d8464b9559b62b29d5 Mon Sep 17 00:00:00 2001 +From 9705950327dfd2f709e29bafb6aed9adfa0ebce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Wed, 22 May 2024 14:02:55 +0200 -Subject: [PATCH 10/11] configure: lookup meson exutable from PATH +Subject: [PATCH] configure: lookup meson exutable from PATH Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] --- @@ -9,10 +9,10 @@ Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure b/configure -index 3cd736b139..482a1f8ef3 100755 +index 0aea9b113..c28bd47b4 100755 --- a/configure +++ b/configure -@@ -956,12 +956,7 @@ fi +@@ -965,12 +965,7 @@ fi $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ ${source_path}/pythondeps.toml meson || exit 1 @@ -26,6 +26,3 @@ index 3cd736b139..482a1f8ef3 100755 # Conditionally ensure Sphinx is installed. --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch index c7bb9b1b47..2d082cf38f 100644 --- a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch +++ b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch @@ -1,8 +1,7 @@ -From a93c2a6b2c9db9c4bd30298da43c37c5e5c6236e Mon Sep 17 00:00:00 2001 +From a02e4fa79740d9ecb82d1162608fb63be80906bf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 May 2024 13:58:23 +0200 -Subject: [PATCH 11/11] qemu: Ensure pip and the python venv aren't used for - meson +Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson Qemu wants to use a supported python version and a specific meson version to "help" users and uses pip and creates a venv to do this. This is a nightmare @@ -30,10 +29,10 @@ Signed-off-by: Richard Purdie 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 482a1f8ef3..0da4bf3e4d 100755 +index c28bd47b4..33b89b236 100755 --- a/configure +++ b/configure -@@ -938,14 +938,14 @@ python="$(command -v "$python")" +@@ -947,14 +947,14 @@ python="$(command -v "$python")" echo "python determined to be '$python'" echo "python version: $($python --version)" @@ -50,6 +49,3 @@ index 482a1f8ef3..0da4bf3e4d 100755 # Finish preparing the virtual environment using vendored .whl files --- -2.44.0 - diff --git a/meta/recipes-devtools/qemu/qemu_9.0.0.bb b/meta/recipes-devtools/qemu/qemu_9.0.1.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_9.0.0.bb rename to meta/recipes-devtools/qemu/qemu_9.0.1.bb