From patchwork Tue Mar 26 12:34:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1916117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=W88syRZ7; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V3q5F6rTwz1yWy for ; Tue, 26 Mar 2024 23:35:13 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rp619-0005Dy-SJ; Tue, 26 Mar 2024 08:35:03 -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 1rp616-0005DK-S0 for qemu-devel@nongnu.org; Tue, 26 Mar 2024 08:35:00 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rp615-0000en-7L for qemu-devel@nongnu.org; Tue, 26 Mar 2024 08:35:00 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6ea9a60f7f5so2335637b3a.3 for ; Tue, 26 Mar 2024 05:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1711456498; x=1712061298; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vYBWS+x0cCz2HwpXjLNdbyBk5DIta0GpDi9Mx2R+9is=; b=W88syRZ7pBOiLHJltUkR93fphlBbbAD2Fggdo/yF67usBXV/FdOTmmmVRBevavORdG eqksBg6NhEdH223fA7QSAMkMywvJ8F+knGVZ3Pfgy5IBcX9aQqFo4y77dZZPZhMtN1il AGS3mTalVmzdv2UwvKPZe2+74hEeUxVZ1TDfc1hgl7pQAnYj4Vo00ilNIawNH86KgHiU ZPbqECJignwq5EMrWBJUz6Ben68TR2hSq+xScbHAk2Fq55nZ/79bpTsi4V706TFYDxDX uDtrhJQGHkWu9nQ7Jb/K2CtmwxfJ3pbMEIhFcQjaUBd4iUF52GvlWf8lXw6wjSYwJPGi n4gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711456498; x=1712061298; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vYBWS+x0cCz2HwpXjLNdbyBk5DIta0GpDi9Mx2R+9is=; b=xLNOcbDubDtR6A/BK7/1nNpMlz3ICoMD9rhizGdHKLgURIO7u40Un9Tp6/YlCQlwDJ YB97yyUvVg5RaaAgHekAiBB4gvXxV2cRhzD6Ets3l8bGV0PV8IUqjRE/nY9t7rTKshGe R3U/t+fMDGJ74ewmyuqbaCFzVSxbiWyywwdf/6Anp2sEvX25waywz2pzd1SBAhwVOoPC kI+myVkAdFpiVVCNiY5wXhZQEZzuW3JZYKu0W2bz067TBHHbedvTyB42YQ91CU5sPWjK Yd5w37pN2LvRXJJSGKe+y+8uOFFkjmnVbKn5E8jAxCWhkHXw1kBd28GwmRd3r0HMiajj jRQg== X-Forwarded-Encrypted: i=1; AJvYcCXQREiZoIx7ISzggr8tEs7Xtg5IrSnmKW6D7vCDbkSu6q8fylt95L6zAVlOuU3uiVnk+0ZMi+7otFMLlClKP/bgYQfHmoI= X-Gm-Message-State: AOJu0Yxo4KH+1/yjZk6y6RqdWYhcrszKouEE7YlTTqAvEAKbNRbmX3df CFKfChizp0r6YB3SyMr7UTQMITgKCOH1jg02wkwtM6KiDscZINUM6iKwUTV+Oc8= X-Google-Smtp-Source: AGHT+IHK2/a9ocYwQfFGOprp1X5uI0qcJyrqhoEAEfhHKWVq5Z8dj53aenuBibdidfnBJgSG1lmEjA== X-Received: by 2002:a05:6a20:12d2:b0:1a3:4671:2285 with SMTP id v18-20020a056a2012d200b001a346712285mr9557900pzg.44.1711456497934; Tue, 26 Mar 2024 05:34:57 -0700 (PDT) Received: from localhost ([157.82.202.248]) by smtp.gmail.com with UTF8SMTPSA id d2-20020a170902cec200b001d9a91af8a4sm6691831plg.28.2024.03.26.05.34.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Mar 2024 05:34:57 -0700 (PDT) From: Akihiko Odaki Date: Tue, 26 Mar 2024 21:34:22 +0900 Subject: [PATCH for 9.1 v2 1/2] buildsys: Bump known good meson version to v1.4.0 MIME-Version: 1.0 Message-Id: <20240326-meson-v2-1-d9f9003775e9@daynix.com> References: <20240326-meson-v2-0-d9f9003775e9@daynix.com> In-Reply-To: <20240326-meson-v2-0-d9f9003775e9@daynix.com> To: Beraldo Leal Cc: Akihiko Odaki , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Marc?= =?utf-8?q?-Andr=C3=A9_Lureau?= , Paolo Bonzini , Cleber Rosa , John Snow , Michael Tokarev X-Mailer: b4 0.13.0 Received-SPF: none client-ip=2607:f8b0:4864:20::434; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We need meson v1.4.0 to fix MESONINTROSPECT quoting on Windows: https://github.com/mesonbuild/meson/pull/12807 Signed-off-by: Akihiko Odaki --- python/scripts/vendor.py | 4 ++-- python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes pythondeps.toml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 1038b14ae0c8..da463fbde557 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() packages = { - "meson==1.2.3": - "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", + "meson==1.4.0": + "476a458d51fcfa322a6bdc64da5138997c542d08e6b2e49b9fa68c46fd7c4475", "tomli==2.0.1": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl deleted file mode 100644 index a8b84e5f114a..000000000000 Binary files a/python/wheels/meson-1.2.3-py3-none-any.whl and /dev/null differ diff --git a/python/wheels/meson-1.4.0-py3-none-any.whl b/python/wheels/meson-1.4.0-py3-none-any.whl new file mode 100644 index 000000000000..ca9adc3f024d Binary files /dev/null and b/python/wheels/meson-1.4.0-py3-none-any.whl differ diff --git a/pythondeps.toml b/pythondeps.toml index 0e8841599935..4269decf0e3e 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ [meson] # The install key should match the version in python/wheels/ -meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } +meson = { accepted = ">=0.63.0", installed = "1.4.0", canary = "meson" } [docs] sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" } From patchwork Tue Mar 26 12:34:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1916122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=uOS6f4i7; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V3q6J74Qmz1yWy for ; Tue, 26 Mar 2024 23:36:08 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rp61G-0005Mh-2d; Tue, 26 Mar 2024 08:35:10 -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 1rp61C-0005Ju-Or for qemu-devel@nongnu.org; Tue, 26 Mar 2024 08:35:06 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rp619-0000fn-O7 for qemu-devel@nongnu.org; Tue, 26 Mar 2024 08:35:06 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6ea9a616cc4so1920518b3a.1 for ; Tue, 26 Mar 2024 05:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1711456502; x=1712061302; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vX1JmAtVLzm5Q7uBUZ/7EOpmvFGga3JnBjC96Zw0g1A=; b=uOS6f4i7CSNTH/0RCXPG2DGfCO0nibQknadqKOOrhYEnQ9idYO7eJu3jYmNN1j1gQa kkoWqgbl1xieQfON6VTvx9owKgNLeIJz8swkbCbYctPe5FDjkSkmiP5MIGUig1SRazEq Qv2bIj8P05PUUyXh6raMzPJAKS3DUh0OZ6avRmxxcr+ckBvqBluPTdsgsfkNkuT/5ipr MhKHJ2dL//dyEou5VcUZJ4L3mu4ohEsi55T4nizWPktr+cIec3HGlSK0nPkNPItTlK7q SORXhDaW76Y9o4Pdm5RNepeRkUXz4NvlmAJTyV84Oa9b1YTLWgaRfw53c9URGfJnzPBY m/Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711456502; x=1712061302; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vX1JmAtVLzm5Q7uBUZ/7EOpmvFGga3JnBjC96Zw0g1A=; b=pgZvpM6vJ6B5/5ciXnvg3LExM3MfRaHhIVxVRvKB7nPP4GMkBZRc8xQXxIzK76WOSY h2OWmUxmnejeK+svvnDoo55XUKqRVv7vr2Pxmpr8Sb2BA06NFXKlCGkr2BnyzlpARYtI EKgr4WeJXFCoXXPRuf1mCj8LQFDuoPacF/pAj1yLfmCWZ64JD6nN7iiGY4qAqQOuXysC ILjSYN5SmpBuMG9+y0SvCyAmxVAyIHDu+c6KYNhc6WIuwL2a2E3N/qpSVGrXoaSB7Xsi LLMMurAbI9Me42uKVFfUlfkB4p3PvLnmbG7MvIdJy0+PrmM6K3MWQxMbioq1NXut6tou U1pA== X-Forwarded-Encrypted: i=1; AJvYcCVNiOQvW0/+y7FcYYeDLBCFdP6RMSDLIDgDakYb4VkqyrBf3YZPiTCFmMEmC+uiAxRx1swHlf+v13NPO4T5t0f5NUdmh+U= X-Gm-Message-State: AOJu0YxPrgDfPfSI9DjQsWBYVAeULS4gzf1ZurDMdNMx09ckdY1T0gux stMHGw36sn7fxCOo/RVpaVV7IUFH6TqX4ivr5CgV5O65WVuFDGsGpwpapUrtSq06XnrI6XiEqEI q X-Google-Smtp-Source: AGHT+IGw781NsosIuzckyyEsihtawzJRU445U3WZQZZ9yet6j29luU2rY6CvelCTeUSAXSot+lhwww== X-Received: by 2002:a05:6a00:198e:b0:6ea:b69a:7c71 with SMTP id d14-20020a056a00198e00b006eab69a7c71mr3453844pfl.19.1711456502215; Tue, 26 Mar 2024 05:35:02 -0700 (PDT) Received: from localhost ([157.82.202.248]) by smtp.gmail.com with UTF8SMTPSA id g4-20020aa78184000000b006e5a6e83f8esm5838952pfi.134.2024.03.26.05.34.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Mar 2024 05:35:01 -0700 (PDT) From: Akihiko Odaki Date: Tue, 26 Mar 2024 21:34:23 +0900 Subject: [PATCH for 9.1 v2 2/2] meson: Fix MESONINTROSPECT parsing MIME-Version: 1.0 Message-Id: <20240326-meson-v2-2-d9f9003775e9@daynix.com> References: <20240326-meson-v2-0-d9f9003775e9@daynix.com> In-Reply-To: <20240326-meson-v2-0-d9f9003775e9@daynix.com> To: Beraldo Leal Cc: Akihiko Odaki , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Marc?= =?utf-8?q?-Andr=C3=A9_Lureau?= , Paolo Bonzini , Cleber Rosa , John Snow , Michael Tokarev X-Mailer: b4 0.13.0 Received-SPF: none client-ip=2607:f8b0:4864:20::429; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x429.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The arguments in MESONINTROSPECT are quoted with shlex.quote() so it must be parsed with shlex.split(). Fixes: cf60ccc330 ("cutils: Introduce bundle mechanism") Reported-by: Michael Tokarev Reviewed-by: Michael Tokarev Tested-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Akihiko Odaki --- scripts/symlink-install-tree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/symlink-install-tree.py b/scripts/symlink-install-tree.py index 8ed97e3c943d..b72563895c56 100644 --- a/scripts/symlink-install-tree.py +++ b/scripts/symlink-install-tree.py @@ -4,6 +4,7 @@ import errno import json import os +import shlex import subprocess import sys @@ -14,7 +15,7 @@ def destdir_join(d1: str, d2: str) -> str: return str(PurePath(d1, *PurePath(d2).parts[1:])) introspect = os.environ.get('MESONINTROSPECT') -out = subprocess.run([*introspect.split(' '), '--installed'], +out = subprocess.run([*shlex.split(introspect), '--installed'], stdout=subprocess.PIPE, check=True).stdout for source, dest in json.loads(out).items(): bundle_dest = destdir_join('qemu-bundle', dest)