From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301669; cv=none; d=zohomail.com; s=zohoarc; b=AwUiEn7kk+Rb1dJLwMoeI1WXcFg4+52SrrygA43z+f/qg743yeItIQY/ZI8hY7r9nXHgMlDlWsjRA8TFqsxkmnqLr57q7Y9U539Mxdy/lmOz4K8iNvbzPzDQBplVlTMq8Kx+NJgQF50sd8GmFG3cKZ+YrzTF0XdwbfeJWqJms6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301669; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7hjxLnAVY/DURtZa77LbXggflUPsLfOq7SYe7f/Hv64=; b=g/q75FfoPIyZlopN3Ri1mXLy8N1zRRnPbnZ1j9NMQHlGUkGPXQo1fX0a3Xvo9Jg+t7VB35ZVgrsS71FEIMA3mBLzubJ/AR0w+ExI0zJ9RhifbH6/UJN1UbmXLILBrFCCRoqQNU4nGnZF3aUsqDMUUQfCHtJEKqbTw4EkcW1fcek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301669674366.2491049349944; Fri, 21 Aug 2026 01:41:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKms-0004u8-5c; Fri, 21 Aug 2026 04:39:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmq-0004t8-NE for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmo-0008IS-8v for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:40 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-438-pu3xNUsjO_-n4hL6_v-nWA-1; Fri, 21 Aug 2026 04:39:30 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-c15f4732dfaso67074266b.3 for ; Fri, 21 Aug 2026 01:39:30 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2459198d64sm330336766b.36.2026.08.21.01.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7hjxLnAVY/DURtZa77LbXggflUPsLfOq7SYe7f/Hv64=; b=DmwRuC9DmpYIeldXp87p7GDfKXngPjT88qbrBJBCIVmPILvnNgGqW9OGmW8flFbyktFe/w XjyUFx9McehdZ/r86PvuKyrW+A7nymhVjsACv3vR39+1OxzbxvxkDw6bk/u38+kzwp9d2t gQeozBL2HFxUCPnaAFhARoclNR3inMw= X-MC-Unique: pu3xNUsjO_-n4hL6_v-nWA-1 X-Mimecast-MFC-AGG-ID: pu3xNUsjO_-n4hL6_v-nWA_1787301570 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301569; x=1787906369; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=7hjxLnAVY/DURtZa77LbXggflUPsLfOq7SYe7f/Hv64=; b=Hw5y34/dx68ooDnJhjfhCvoROGqhWPZ9s7Fosl+vNfz403q9O7OF+vZilQmibktHxo MEoFZFIPWm67Gy8jrVRAjsnSlHNyrIVoVjKXyI9BmMcOW6nwkkDuQeC3JoZFXKmXF2oD X8ZFN6/GW9HW6UoEY7Z0rk0ilcW5KJN4bsD+VP2mLao08wyEus6BtkFbF2T3MHL72qMd oxOz6B5wqIuLuw/eT7/GON+CdwESvahd6gH1rKvBXtRSTjsjOSHvJzuc8sgNabfWtc6o opFmFGPvglHr7x82dylHLUTRqWRMdXFuRqXG0PsrT54GkBX54xLegZdLiO+9A6zQxsSb XPsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301569; x=1787906369; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7hjxLnAVY/DURtZa77LbXggflUPsLfOq7SYe7f/Hv64=; b=av+f/spXJalp2j58kl5cr+V5VhOD+QNWt1D6ruc16WOscIRuTgMJuGxav8IC02V73A an3c59luLScrclkwWBvko/iLj5c2KUhj+jLhB9jtimuwRzxTtN5XS0FmM0UO7X+H1dxH YEF452kzJGCfcxnnKNPES6BFdTp7Sg7xeiQXbg31WebJhiFReB0N8HNKzgEdoFo3sSeE hk7i4gM/1EB36p9NuvKG4HSydRAkso37Hm+TbQBoJHpa2L5AVjNxnsnaQQxs0LSRB6SL ifpGZ0cxi9k4QKRHEhfAmmTk5JKCITsInrvptDk9LHyn6rYZmicXWFLC+920tIsw/amk +kuA== X-Gm-Message-State: AFuF++lJIHGqupQevcSurqLhfBv1vBQrgTHsppH9QgWC6N2JI7T72ui9 RjTNmfpGYWa+x1YNNu/uQfeFsWGZO4j/e4njcf06vsyVCok41u+Dko79wbmiBuZwfad0ZsjXyRU WIYJhm2CYG81t/rOVZTjv8zPLMy+ACtZocfuS3gj+F+hWOFVkbQ0InFHVlz2V0SgcwQvAHiqDtH Mjz1qTmqNtjdJl3Q7pv7Wg1OwCnwpk3cWxstre5kJm X-Gm-Gg: AR+sD11y5PYkqrA2QqTQRK4poF1H/V8cazCliBaG9HvcLzul2ZSnx5MgX2LA9kTtXLL odHUwK50ycWhTfQE5yugcQjYrxywaUXjM7L/T2EdQQFMAe2jeQQMXMWY1fnfCBs7x6L6Vt3bsRA gAKyRZyxt9pa2Ens1sz9+QTW60j3XcwOqg17VorZEBoWDwY9rMX/cNIIp7fLJ11XLwtPVz2EPgC DKdwwSqx3kMFpD/8cHA9yTrNMbeByu9SIlEeaFdOhK7ukvJipMT5C7k3aBB9ZUNFIjqMyqHgueG MEiO57GH23EKzZlyujgD2H9Ms5tqyrS0JwTu7GVlWTcHTv/4uZZM+4dXpCv5CZIS8KuUiQwOFAD WZErpLjojT428C9P3793ttIGxv0TBbExS42WbiSq211bPBppDbtDatQMhrTRSAYCubgv/u2hR1c CqRqI= X-Received: by 2002:a17:907:7256:b0:c21:49df:1650 with SMTP id a640c23a62f3a-c246a5eededmr424106466b.8.1787301569405; Fri, 21 Aug 2026 01:39:29 -0700 (PDT) X-Received: by 2002:a17:907:7256:b0:c21:49df:1650 with SMTP id a640c23a62f3a-c246a5eededmr424102666b.8.1787301568941; Fri, 21 Aug 2026 01:39:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 1/9] scripts: print build.rs diff Date: Fri, 21 Aug 2026 10:39:16 +0200 Message-ID: <20260821083925.2008135-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301670919158500 Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index 3820d121183..84c652127f9 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -59,8 +59,10 @@ def compare_build_rs(self, orig_dir: str, registry_namev= er: str) -> None: if os.path.isfile(new_build_rs): msg =3D f"build.rs added in {registry_namever}" =20 - elif os.path.isfile(orig_build_rs) and not filecmp.cmp(orig_build_= rs, new_build_rs): + elif os.path.isfile(orig_build_rs) and not filecmp.cmp(orig_build_= rs, new_build_rs, shallow=3DFalse): msg =3D f"build.rs changed from {orig_dir} to {registry_nameve= r}" + # diff exits non-zero when the files differ, which is expected= here + subprocess.run(["diff", "-u", orig_build_rs, new_build_rs]) =20 if msg: print(f"=E2=9A=A0=EF=B8=8F Warning: {msg}") --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301666; cv=none; d=zohomail.com; s=zohoarc; b=aVYoji1VTHsmY9EtQhgsNxpI9ue/33RWKi2qU9+l0axKS1+fKsHD9z1yA1DpMNQWOAA2vtLpK1dtnD/aZw8uHXMTSin5LFFByFvDUnxPPjRqJ6lkpWLUiw0zCGh37vGmJqVQWXQ4xB3A4Ixz1tSUcjbQzw+mTBP/1B7b3ITxRkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301666; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Fw4f0kzvVqy0S6njX9tdZ399Ssuq2ixYN/WFdO9R4bo=; b=e4o417BdLpL+H7LbKb+y3Ygpndc4rkScve++bvDy9TjEQsiyP0XAflf0xbdKX5pLauYZnHY+O4UfYmFiZwmlVFdCz3ePst1Kkc0h0oiGAU/ypKyp9WMB1abtkqJyZJiScgo/gBS9LPI7lIqQ89mYFaXLD4i8GcxamjSk+dlEdLQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301666217212.84751723143268; Fri, 21 Aug 2026 01:41:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKms-0004u6-4g; Fri, 21 Aug 2026 04:39:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmp-0004rc-II for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKml-0008I4-Vu for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:39 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-202-qt8pfk8mP4qlA0-75ovmjQ-1; Fri, 21 Aug 2026 04:39:32 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-c21855b1c82so79052666b.3 for ; Fri, 21 Aug 2026 01:39:32 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2459198d59sm333123466b.35.2026.08.21.01.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fw4f0kzvVqy0S6njX9tdZ399Ssuq2ixYN/WFdO9R4bo=; b=NV6qKWEQ7ls/6L+qPoM+b8SStaJNnRg1L1TW1djTkTf8WQOBKMVSX4A/aViUZpc1cAFyP/ nE1vZdcoDMDfQIaxavIhny9+wHnuACX7AfolLHN4WTwnyDLosV4m3Hpj2Ir7rpZHLXNICr mMelDAoJmIdLN6C4avKdGwKMd+CMDfo= X-MC-Unique: qt8pfk8mP4qlA0-75ovmjQ-1 X-Mimecast-MFC-AGG-ID: qt8pfk8mP4qlA0-75ovmjQ_1787301571 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301571; x=1787906371; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Fw4f0kzvVqy0S6njX9tdZ399Ssuq2ixYN/WFdO9R4bo=; b=kE9G96Wekqyho/GVVyQSwSAHGpaMLZ9YFCTL8wsEN3uaamm+d1/ulsFpsJwCKVl0eg JabCLMfzOvxldluuCnoI2BTn3PWw/0OLFGQaqdSYBwAtz+/p5KBdOAUJknJm5yY0z/FH cH7RSWxczTBeVp0ygeM0+mR4KrQhust33eN/jxBGt6NFfCunTLrL+IdW4vRGr99PBKSC JnG+ZHxm7RsiJg9VGLor6h56d2+882GyTCTNzRixZorU8tD8nFBqZoz3cdNSIyqUBt2S hxwvEMrtP/GZpVnAK1JhjOFIyX2tmQeyjgCakoDaPBTPFKS3D8anB7LtpzlSPn0FzEG8 Olng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301571; x=1787906371; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Fw4f0kzvVqy0S6njX9tdZ399Ssuq2ixYN/WFdO9R4bo=; b=lMNloDb5I4OX/KqAFtB5DIVZ7CbG+K1s5G2XoT4DERawOKq1FzNU5O8XYqv5X9UJ+k R6IaaWf0MXg4HgagwkwPGJIyMqY/TGrKhjeVTRiw9/aFXKRVW0B/XvmppyWiCH1mSBxc de5HXJdiBsflOaiFa1R8mnBK3+xwdgIFfxI/GSjfe7tjpJALLqapBsy/oObSilCylaFm mJIKNmntvkj6QQUH0vcPi1l6tUD7Hf3BhPNrp76zRiMDSddY8Tw1S03yhZB7sCuLJ093 Lbnt/tHHHMA1qx6POLK4FPjt5qIEtto3Za7VNl8a4xn5O/zS02iSq46oyh9iGDYRD0ix pzOA== X-Gm-Message-State: AFuF++m+Kx86Jc6zOtFvSafQ8zPJvM4xnhB4l+QNbNiogJoWke4YcYaF qJK4vABRDYD8IarHp+LpJVzxEHDtyJu9K5D+2ANt90MA9Hc/rHbSA3FRoNBZduKHV8brnHyVGju Ip8yLkzHRljqU+M+trYyzNM6Fzs1t7SkIUEs0QCMAK6iJpQ0xe7XMk+xyCYRKDYlCOtudJiM3Jx AIYCjfhwJqRLVV8oSfdPlJdXKqDGX9kDRIPMf5kmyZ X-Gm-Gg: AR+sD125EqePnR0PCE/q1VMglIk70QyH3pShL2UNcbqWlO8LsM6hInB/N7/KqockNga p7HUIrirOLPcPKcfLdThav6rlxHl06OvgpE9col+D1qhvj+W2ZQGviywg9oN9t2yg+JJ97UDrMP q/hvGEh1FclYsD54He4+iw3XTk0RZSJlIlFWEsMNsgaKvY80R72tluf939ekaf368GTyiJ36RYI TkSMI9hZpaJucgsE64mz9QsQvTKhgcVUkUWEFJL2Ys6FE45rHn7/yw1YU3WHY+LM9ef/M7L2h4/ 2ZjML73GDH9sIsxiOX9JLrZwf13olnRe7chziwdsPHOUmdNesPKBsbkQLrqhXtzga1SncNt/Dm3 BJmyIpjRdYviEa8dOn6bOiqkFOxuYgm6KKt1GckUIXRs31i23gYwHTA0rYPZtNYdUCPVaNaNL+a hB2ME= X-Received: by 2002:a17:906:581b:b0:c16:14d1:b529 with SMTP id a640c23a62f3a-c246a62761fmr376783266b.18.1787301571358; Fri, 21 Aug 2026 01:39:31 -0700 (PDT) X-Received: by 2002:a17:906:581b:b0:c16:14d1:b529 with SMTP id a640c23a62f3a-c246a62761fmr376780966b.18.1787301570937; Fri, 21 Aug 2026 01:39:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 2/9] scripts: rename variable in scripts/get-wraps-from-cargo-registry.py Date: Fri, 21 Aug 2026 10:39:17 +0200 Message-ID: <20260821083925.2008135-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301666975158500 Do first the change that makes the diff larger than it should be. Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index 84c652127f9..0095bd937ec 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -47,20 +47,20 @@ def find_installed_crate(self, namever: str) -> str | N= one: matches =3D sorted(glob.glob(f"{path}.*")) return os.path.basename(matches[0]) if matches else None =20 - def compare_build_rs(self, orig_dir: str, registry_namever: str) -> No= ne: + def compare_build_rs(self, orig_dir: str, source_namever: str) -> None: """Warn if the build.rs in the original directory differs from the= registry version.""" orig_build_rs =3D os.path.join(orig_dir, "build.rs") - new_build_rs =3D os.path.join(self.cargo_registry, registry_nameve= r, "build.rs") + new_build_rs =3D os.path.join(self.cargo_registry, source_namever,= "build.rs") =20 msg =3D None if os.path.isfile(orig_build_rs) !=3D os.path.isfile(new_build_rs): if os.path.isfile(orig_build_rs): - msg =3D f"build.rs removed in {registry_namever}" + msg =3D f"build.rs removed in {source_namever}" if os.path.isfile(new_build_rs): - msg =3D f"build.rs added in {registry_namever}" + msg =3D f"build.rs added in {source_namever}" =20 elif os.path.isfile(orig_build_rs) and not filecmp.cmp(orig_build_= rs, new_build_rs, shallow=3DFalse): - msg =3D f"build.rs changed from {orig_dir} to {registry_nameve= r}" + msg =3D f"build.rs changed from {orig_dir} to {source_namever}" # diff exits non-zero when the files differ, which is expected= here subprocess.run(["diff", "-u", orig_build_rs, new_build_rs]) =20 @@ -68,7 +68,7 @@ def compare_build_rs(self, orig_dir: str, registry_nameve= r: str) -> None: print(f"=E2=9A=A0=EF=B8=8F Warning: {msg}") print(" This may affect the build process - please review th= e differences.") =20 - def update_subproject(self, wrap_file: str, registry_namever: str) -> = None: + def update_subproject(self, wrap_file: str, source_namever: str) -> No= ne: """Modify [wrap-file] section to point to self.cargo_registry.""" assert wrap_file.endswith("-rs.wrap") wrap_name =3D wrap_file[:-5] @@ -83,18 +83,18 @@ def update_subproject(self, wrap_file: str, registry_na= mever: str) -> None: =20 # do not download the wrap, always use the local copy orig_dir =3D config["wrap-file"]["directory"] - if os.path.exists(orig_dir) and orig_dir !=3D registry_namever: - self.compare_build_rs(orig_dir, registry_namever) + if os.path.exists(orig_dir) and orig_dir !=3D source_namever: + self.compare_build_rs(orig_dir, source_namever) =20 if self.dry_run: - if orig_dir =3D=3D registry_namever: + if orig_dir =3D=3D source_namever: print(f"Will install {orig_dir} from registry.") else: - print(f"Will replace {orig_dir} with {registry_namever}.") + print(f"Will replace {orig_dir} with {source_namever}.") self.changes +=3D 1 return =20 - config["wrap-file"]["directory"] =3D registry_namever + config["wrap-file"]["directory"] =3D source_namever for key in list(config["wrap-file"].keys()): if key.startswith("source"): del config["wrap-file"][key] @@ -111,10 +111,10 @@ def update_subproject(self, wrap_file: str, registry_= namever: str) -> None: with open(wrap_file, "w") as f: config.write(f) =20 - if orig_dir =3D=3D registry_namever: + if orig_dir =3D=3D source_namever: print(f"Installing {orig_dir} from registry.") else: - print(f"Replacing {orig_dir} with {registry_namever}.") + print(f"Replacing {orig_dir} with {source_namever}.") =20 subprocess.run( ["meson", "subprojects", "download", wrap_name], @@ -162,12 +162,12 @@ def main(self) -> None: for wrap_file in sorted(glob.glob("*-rs.wrap")): namever =3D wrap_file[:-8] # Remove '-rs.wrap' =20 - registry_namever =3D self.find_installed_crate(namever) - if not registry_namever: + source_namever =3D self.find_installed_crate(namever) + if not source_namever: print(f"No installed crate found for {wrap_file}") continue =20 - self.update_subproject(wrap_file, registry_namever) + self.update_subproject(wrap_file, source_namever) =20 if self.changes: if self.dry_run: --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301656; cv=none; d=zohomail.com; s=zohoarc; b=Ttk9dgxvNbWLkqryfGNdmtXP+2O1NiMBOMU5BKXR7EPOpeHPMaRIdmfhuD11Q30eQt3rYoajyqhRG1fAP0K6jWAuyD5ffZi/U6K4XizMOsmzGBOiFTCZ7thtqZ2/LqCXXlPci3nHDFJ6V2ZtJHr/1Yscyd/C5vBRxNEzglvhW84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301656; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2FiQTp7Qc/4aZI8CJqj9y3o4hGPPctMwiZp74U/qlY4=; b=jKh1am9ONjjyDMf6FbgU9jo/d2Toq8v+4ntKHPxaQ68KTShkaUGj3ysevjMvcavzlT1lHGuS/4R7Zra4K+d0OFZsH9Iz0uBl0IKNNLw4dGDgcLvfCk/Hx8uwWxBl3YT6mcBr3nLCbs7tz6mh32nG8hUXZ0KOumlwJn+2kDZGRcI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178730165617418.99387812972327; Fri, 21 Aug 2026 01:40:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKms-0004uN-Il; Fri, 21 Aug 2026 04:39:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmq-0004tE-Sp for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmp-0008If-6V for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:40 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-221-joPPH8eYNr6KFB_dBIWpXA-1; Fri, 21 Aug 2026 04:39:34 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-698b899b53cso698895a12.3 for ; Fri, 21 Aug 2026 01:39:33 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3feec9d52sm5690435a12.2.2026.08.21.01.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2FiQTp7Qc/4aZI8CJqj9y3o4hGPPctMwiZp74U/qlY4=; b=FH0IX1U9cLapImUoV0QFmZUqrLnhIjLOQDLAMImFHGtBqy9oL6O5aS+7t9ID2R9SzbPoDi B1yH1VHTrbcTMywJGndHslSijgLm2/AWJkAxWfMBKQ2EAidQHp5HLtnfUwjcy5jYKAYl6L X49b9ufU83D9C/NlDkO9hd+03nkz4rc= X-MC-Unique: joPPH8eYNr6KFB_dBIWpXA-1 X-Mimecast-MFC-AGG-ID: joPPH8eYNr6KFB_dBIWpXA_1787301573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301573; x=1787906373; darn=nongnu.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:content-type; bh=2FiQTp7Qc/4aZI8CJqj9y3o4hGPPctMwiZp74U/qlY4=; b=H97O2gnFrlUUz9VsI+0oEI61Ut2sW2K6LjU+1wwnnyltby8/kdJ/OBXig81VgXxOa4 QJqKqpVAwOUFce1l8J1QJyu1xL0DKkcZ/NCQ1HrNoyqW2MNuiB0iAg4/04baxuOM0QWf tF1MJFlMBcpdZn466PIkUf+FyMVtXzyaepYuL56N2WLKU8GJkaPE6MWUwmnszmPUBI4N pB9SUO2kgsRdMX/KjwvTqplp/CpCMrwhaRdH/x3zGuo/zprs8hGPXvzX2GGFS5WtsSGg hwbiWKPQtCY+5zoN5lqeaDHK/3Ku5+mB2RKyQL2FxAN5T+F1vyHan5/zUjd01GFO+Vip +4kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301573; x=1787906373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=2FiQTp7Qc/4aZI8CJqj9y3o4hGPPctMwiZp74U/qlY4=; b=WYl+n3WaOTOBZGDXXGW6dNaoPk18XFgxMR42deuqrX08gFyWmGkL18ryMx7nCORpTQ s8UjhuY7EA4zPEFfd2GQoCMRbL3vB9gBI/Z8EarikB+VZRwA5S0aVvqebna9C9T3Kzrz A67mpyxIxy2V3jvmpj+j8K+jxznfe+DuYrbWeXTp7nV7whQE/+6zGBfdDOuUqgGJTKh1 JkFO4ulMxu8lauv8me2g4fqeVbBorhyia7Od86tfM70TSRpEdwiZHQ5k2XG4Rgkn8Sbe oV6/HQg0+zx1BBNPZTi/8kB+mUnjJtpObzY1kquw4BYP/6CVpZ6k/0vYr2EnjMEXUIsP nKYQ== X-Gm-Message-State: AFuF++nMAPBhSCwqwmUQltXTDnpbcZBlkBrd00dXYjW9jrC+qb4syOLz GvzdNeg5ZTrsayvWAsP3ASDtn9/rL1My0/Fx9RocSVZwGdfngN+7mkDQUf5nxutWStnwWo+XgtV EFtWPu1fiZcQSmxbkXi7FtRIUFbulbBsHA75MZulaENKi+6lXOQ/f7OqYH2OJOHz0tGXj6jjdXP l+ycI4888BZwoj7CxJSQlMc/f7HIy/AEFRSLv+rPw6 X-Gm-Gg: AR+sD11mwL5G9nFwLBEwk6yAREq/tpSNlYa6q65ATTXxKrN7GaGnEjD2+bZdfhCHYx9 W09W4qIjZ81i1h31mh8aQo7HF0nfLHYpLItjAFQbuXDeh+5N3QOc4EERKcIKWh2mgza3H0up1zD SOlSFFtPv89cNFVRg3h161q2CgfOhO0XKUdTNGqDOs1b07dOVjfY1HHbhBQ7DOPfW+t6gP7vFTy 3Td3lxTY1C+FHY5gBLJfbv/n7XxD8NBNplvoPFxtLCetPMpEKCI6BIEjX3Z5tQRqE7Y3Zq+4Ts0 AALUqbal7R/refoXWMTWctl3wpbjLxIUBv/zKn1vzU8GQqfa90ukY55Gb7Wl7bPSRCRPoJnaLpS 2Ebim+2AeLn7dkCzycC1rUyvGNe9Q74sN82I4KPs540hhGWKV0DJn+cDP6qkGCXF3MxvLJR909r 5FMpo= X-Received: by 2002:a05:6402:e09:b0:69f:fa13:ed3 with SMTP id 4fb4d7f45d1cf-6a42f229682mr5353496a12.16.1787301572773; Fri, 21 Aug 2026 01:39:32 -0700 (PDT) X-Received: by 2002:a05:6402:e09:b0:69f:fa13:ed3 with SMTP id 4fb4d7f45d1cf-6a42f229682mr5353454a12.16.1787301572319; Fri, 21 Aug 2026 01:39:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 3/9] scripts: do not assume the new version of the crate is present Date: Fri, 21 Aug 2026 10:39:18 +0200 Message-ID: <20260821083925.2008135-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301657018158500 Content-Type: text/plain; charset="utf-8" Until now, the new version of the crate was always there in the registry. This will be different when crates are downloaded from Cargo.lock, so delay the comparison of build.rs until a point at which both source directories have been extracted. Since the .wrap file at this point points to the new directory, delete the old one "by hand" with shutil.rmtree instead of asking Meson to do it before the .wrap file is changed. Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index 0095bd937ec..8b45c1551f5 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -15,6 +15,7 @@ import filecmp import glob import os +import shutil import subprocess import sys =20 @@ -50,7 +51,7 @@ def find_installed_crate(self, namever: str) -> str | Non= e: def compare_build_rs(self, orig_dir: str, source_namever: str) -> None: """Warn if the build.rs in the original directory differs from the= registry version.""" orig_build_rs =3D os.path.join(orig_dir, "build.rs") - new_build_rs =3D os.path.join(self.cargo_registry, source_namever,= "build.rs") + new_build_rs =3D os.path.join(source_namever, "build.rs") =20 msg =3D None if os.path.isfile(orig_build_rs) !=3D os.path.isfile(new_build_rs): @@ -81,10 +82,7 @@ def update_subproject(self, wrap_file: str, source_namev= er: str) -> None: if "wrap-file" not in config: return =20 - # do not download the wrap, always use the local copy orig_dir =3D config["wrap-file"]["directory"] - if os.path.exists(orig_dir) and orig_dir !=3D source_namever: - self.compare_build_rs(orig_dir, source_namever) =20 if self.dry_run: if orig_dir =3D=3D source_namever: @@ -99,15 +97,6 @@ def update_subproject(self, wrap_file: str, source_namev= er: str) -> None: if key.startswith("source"): del config["wrap-file"][key] =20 - # replace existing directory with installed version - if os.path.exists(orig_dir): - subprocess.run( - ["meson", "subprojects", "purge", "--confirm", wrap_name], - cwd=3Dself.top_srcdir, - env=3Denv, - check=3DTrue, - ) - with open(wrap_file, "w") as f: config.write(f) =20 @@ -124,6 +113,10 @@ def update_subproject(self, wrap_file: str, source_nam= ever: str) -> None: ) self.changes +=3D 1 =20 + if os.path.exists(orig_dir) and orig_dir !=3D source_namever: + self.compare_build_rs(orig_dir, source_namever) + shutil.rmtree(orig_dir) + @staticmethod def parse_cmdline() -> argparse.Namespace: parser =3D argparse.ArgumentParser( --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301654; cv=none; d=zohomail.com; s=zohoarc; b=nKiKDi0wwemFzDjc+5Tyh5NCmrlDh6I/PTwRtsJJbry4lx82eGrx+CCC5Wah7HkLZ1hk32a72AjmVFNjI8YFZolgTx/mLNr3N8nBaG9EK34wIqxiottKqfRekaDYVrHySp66ajVt9jHEEusmDewREVc2q9B0a1/FQdvV1XOHEzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301654; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pmhrxutqvfwk8kCCA5LdrLPDB71Ss207mNaYjLClR4E=; b=Ej70Sb/O8bn/UzZB5NulCs74FwvziaOD4E9xjJuU4zNhsEeR92a92fLouTOUGUfclnqK7INqndRbjmbSe6pTKFffbHKTzzx3zYSr3qGWjB0DFHBTc4FQ9YI9xWHS+l6AS7jFTdx1Rzu2OYzxp+Rjzv76C1MgdFgJ6fD6auVNQvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301654308506.5850186928142; Fri, 21 Aug 2026 01:40:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKmv-0004yH-RS; Fri, 21 Aug 2026 04:39:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKms-0004u5-15 for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmq-0008J2-0h for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:41 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-tuvuMnmtNMaTuoCIIn73Eg-1; Fri, 21 Aug 2026 04:39:37 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-6a368c27a94so926118a12.3 for ; Fri, 21 Aug 2026 01:39:37 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3ff1567f8sm5559242a12.18.2026.08.21.01.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pmhrxutqvfwk8kCCA5LdrLPDB71Ss207mNaYjLClR4E=; b=bTb5uxZY0Rvl8J2R4OhXlthg+9sYCa4tXnHmWR/0YiQjC3ffUxdde5GxbM7Weyf6Fh0cOk ipaUyMMInJ+SYbzThDFobNcvr0hsiZPPbAsFkmsItXWN0dmuPrFZJ9fBlFdFZaltQX9Md/ KsYzhA9w93F+cZJHy7+BU9KNUY9b3w4= X-MC-Unique: tuvuMnmtNMaTuoCIIn73Eg-1 X-Mimecast-MFC-AGG-ID: tuvuMnmtNMaTuoCIIn73Eg_1787301576 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301576; x=1787906376; darn=nongnu.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:content-type; bh=pmhrxutqvfwk8kCCA5LdrLPDB71Ss207mNaYjLClR4E=; b=lOlH9T6MOUcAUbMPQ2SjRcDwMEE3SdtswBo1yhXKHHHUSnathCrs+fIaSlIuA1P3iE xfNiOMa+iItZwGSdfa89IL2phqDnmRzlMnBqm+GP0XSBPe5WwKCIpGUp5iNfr25iYNJY xF+C48zkeQXb+H6IzxDvhIZ6gxnviWj1HFiuD0LPGmJi0s8x/fG/ySguM5kBIemauSQ2 8j48GvvYELNlHzvGceFao+r/jJ095CBvMiaH3iI6Vz4cDkHUVOaF6ebSVxbVN3z2+5Up HGO2NU6QL3ewphE2nCe0WO7O6xUQ2rM5A0HsMZfdzZMNxFSjsjidjS0aJrcM4OLpWfno JBHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301576; x=1787906376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=pmhrxutqvfwk8kCCA5LdrLPDB71Ss207mNaYjLClR4E=; b=Bvq0AGWi+JehfvlwPEXE8Ru35TzZFqpM9XaWOHmCTLru1cytglUF0SzuITPvInDWMg rg912fJ3t2LdINFofhCPavAuTbgoIXH+QI11l6FddktONjeomum63GMMPtVwe9Hx818t eXBJJCg0GqmSHuZaiRq6/K+XtKUXLzMeRFIgL/y0rWxKepYk1uTLsKRpc3SKjeitdlvD LT7laJxjCBZ2afhmwFmMS/ybuq6tlzZ4OY4xJmr5JyihdC7Dh5iS05WSaV9sV6X+ApEw j4etMsgBM5qdaEXkE1qHhpVP3xDhPJr7rAwgW0yVm64rJPXb0yAvWH9d4eclhj4Kn78h H4Yg== X-Gm-Message-State: AFuF++lZRoHxCyPHuiMqA1MA4NQUTVoIWd95SAfMFJnehwa9UFo20f9q b8oNbAJcoOZC+BOuhqmZhyrVAQ9mSJqQHVh8wz1LQv2cPqsUVx4yhlxDc6YlTlY8sFUMfICHzdG etyNtBeSgV+feQuPRVZk1RVkLI8kSrHE/h6REk8B7MpVDWVWJJgrI4S1gXllsQ1I7rVu8xy2t4d bh55uOdWk1QeShSC0Xzrjwxo2+Vh42Ih7Tmi6EW+CN X-Gm-Gg: AR+sD10jetpWAZ6d4E4LtUNTyX0oxydngw9YBKvMOKveICdOfcF6LQFQQrXWGUOX0QS h71v6pz5FfvBye3SI68yPF+9FkHkq0cbOxuQ6APJ4dxpm4/2w0z4LPRKN/CukiAhpiJ7i6FEK1C 73my4Tij1io4Ta+3ppQo4ylJ7zAxicNBfI25+m0Z9zb71YNNwjGxjzfyLEFNPEeq4z1XkrXlVLv NkDDQNYvm/5rZGk2ARe6Ygr3pSqr6IPRK8KP97jqpE9PSBqnDU+pIP7rm/MVEVHcupjsqjAWm9I xa9A5sOmLMYpjpJtJLhJgycnpCayMBWubRbMl+IW5wbN32ANbOf4hkDGlFdt1gytfvRqYGN1F+v 4FiuPgucWG88XdWcnwqu4+NbDlivUm4tDQp8h3xefUmoA+acTv0UO7ZHfKsBXRoJAAs2X2Ss3rR mL4oU= X-Received: by 2002:a05:6402:1f07:b0:6a1:c908:1701 with SMTP id 4fb4d7f45d1cf-6a42f26dab3mr5425875a12.13.1787301576459; Fri, 21 Aug 2026 01:39:36 -0700 (PDT) X-Received: by 2002:a05:6402:1f07:b0:6a1:c908:1701 with SMTP id 4fb4d7f45d1cf-6a42f26dab3mr5425827a12.13.1787301576015; Fri, 21 Aug 2026 01:39:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 4/9] scripts: prepare for introduction of CrateSource class Date: Fri, 21 Aug 2026 10:39:19 +0200 Message-ID: <20260821083925.2008135-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301654884158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index 8b45c1551f5..8114f0731be 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -48,6 +48,14 @@ def find_installed_crate(self, namever: str) -> str | No= ne: matches =3D sorted(glob.glob(f"{path}.*")) return os.path.basename(matches[0]) if matches else None =20 + def rewrite_source(self, section: configparser.SectionProxy, orig_name= ver: str, registry_namever: str) -> bool: + # the registry already holds the extracted sources, so Meson does = not + # download anything: drop the source_* keys. + for key in list(section.keys()): + if key.startswith("source"): + del section[key] + return True + def compare_build_rs(self, orig_dir: str, source_namever: str) -> None: """Warn if the build.rs in the original directory differs from the= registry version.""" orig_build_rs =3D os.path.join(orig_dir, "build.rs") @@ -82,7 +90,8 @@ def update_subproject(self, wrap_file: str, source_nameve= r: str) -> None: if "wrap-file" not in config: return =20 - orig_dir =3D config["wrap-file"]["directory"] + section =3D config["wrap-file"] + orig_dir =3D section["directory"] =20 if self.dry_run: if orig_dir =3D=3D source_namever: @@ -92,10 +101,10 @@ def update_subproject(self, wrap_file: str, source_nam= ever: str) -> None: self.changes +=3D 1 return =20 - config["wrap-file"]["directory"] =3D source_namever - for key in list(config["wrap-file"].keys()): - if key.startswith("source"): - del config["wrap-file"][key] + section["directory"] =3D source_namever + if self.rewrite_source(section, orig_dir, source_namever): + with open(wrap_file, "w") as f: + config.write(f) =20 with open(wrap_file, "w") as f: config.write(f) --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301637; cv=none; d=zohomail.com; s=zohoarc; b=a/M6xHVvLo4ZDvRoXiUFLiluGI1XI6AP585tPWoA3IugA6Ngs2ztwvDm+cSIbTOr2x7W7i6aB1PRQopAY7CvuojsPou+89CugV31IWDUxi8laEVYqfQEd23gaXbPxeOV0wdnZyWJnjaxUX1AsnIbLnICW/PK7Y2C5a3wCTutBhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301637; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=54WY2o82iGBH8d5H4JTOlD44ATSwqc2GBS3osVVeSxI=; b=ifpLw46bxzptqDuZOAfZKQEMFX3I8wGwXGzTtQ2wCIorR5FYgxJ0KWJ5oWWggnt2TSGqTr7LvIiY3WaRRxXcLJRZcWVhqSpS0yu9Z5td0pZ6HXsgVD09duqiUtK4G7L1dUFvM+0ZG3wqDbTnlKrRo6xcz0xi9cM54OAHwrdJV7M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301637367840.200139815652; Fri, 21 Aug 2026 01:40:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKmv-0004xf-Bi; Fri, 21 Aug 2026 04:39:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmt-0004vW-Ei for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmr-0008Jb-NT for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:43 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-351-f0P-fy2ZP0qXbfPLZgLKrA-1; Fri, 21 Aug 2026 04:39:39 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-69c20d1d150so677194a12.0 for ; Fri, 21 Aug 2026 01:39:39 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3ff0d5f70sm5455879a12.13.2026.08.21.01.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=54WY2o82iGBH8d5H4JTOlD44ATSwqc2GBS3osVVeSxI=; b=FjR8/VV5feAA8sMsYXNwWQKPFpEBcyhX8qqdducB691p4NHxAfQtQu0LzHYQTmt4C2fHIX QMR/rx+1vmlPM5DUnO6mnX8E/FElLL8PangiZltTyhLhPYD1Y3FceOKZkfgyLTSSSxx4Bj IhOWNqUqo8Mm8vYKhir/54fj37FZh8c= X-MC-Unique: f0P-fy2ZP0qXbfPLZgLKrA-1 X-Mimecast-MFC-AGG-ID: f0P-fy2ZP0qXbfPLZgLKrA_1787301578 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301578; x=1787906378; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=54WY2o82iGBH8d5H4JTOlD44ATSwqc2GBS3osVVeSxI=; b=e+oq6Mj9ORzN64X9Ss0t6FV5eo0ukLpBvbauR7j920erbNTTfa5lAE4RUFfyNV5Vtq W8B8IeshO60GJ69lcVyPHOCM06GlKjznDMOub2f2Kgskv8+kYhEZR/Y2DrX40BwyIWfo GGxkvI2bjyo+wG2qrDmkjTVLZ2LzfCZb4UcBCerZdMoSmbu8Xm1e/B4g4mk2zMiAYXNw 1kva8RNYbqISpemq8Z39HfZtJNCLnAqzSNFndxmSoArKYRztD+8ITWruEP0ya+fSn5PT F3Xq7WcYjBwrizdZ22rhBE4pPIHvDPWKkuSIZTChuFulXySlo3I3xFUy97Yn/glQb0v9 DJXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301578; x=1787906378; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=54WY2o82iGBH8d5H4JTOlD44ATSwqc2GBS3osVVeSxI=; b=Qe4zFBBqf7Z32uzlSCwElipe+II21yoGGTpcpgXF7GJVr9LsoJlZpbzVdiMM2pKr5I bI33uV7U0c3CLUshO/7f8LAI/7xdxyiVCU+MIol0tDEFUS9BbJsjR/bl3kCa0NA8lqEB ONz28Xy5PhAQdZ+rYKhk9YIbXbJtPFfao1z8kWlHpoEsjhnReA28We0uAX6YhZxJGHbB g2xK1lnRcCeFPLVmvPBAxzWC50q5jsoTSo+J3g6ehBxK4AfsSb3Sc54UE9qvnkef4hRb P30nbn7YVN1koLnyPL2/cnVo9+j1sa/TRDfWFb8t8g+veGbia2IVhdJxFqTVsPphKSYo hunA== X-Gm-Message-State: AFuF++mIOjlFQexc+cWod4e2CbymXYhPtLA4zeK09KskTjqAWZGBXAV5 T3U98Nk/mbKvcGEMC+OSZU5ji316YVYsTj7vDyM09Ra3FtKugCPU5Ip/T8yuZw0oKoYdyUz1Y2s GjtoZrezNveRFLoj550T4bUwQS/OL9UoRL7vQtmNBFU++eODCOMMLl30mWhJXJRrW8OSPzJ7c/M KLhrEWYn/8CRBe704wX1Oz5XBgKayxEEbNh7Q01C8d X-Gm-Gg: AR+sD12czAhbYDqE7CV4GqSXw2GSYrY7o9keUKkTCTghdlE0fEpiqzSmtoT2cNihlfT o+SyYl548Ypm9thC3OK2rBOzrZFVhtzIChH+VfKo4pPxwiADwmRnNsS9w6cgz0gB4IC6a4y40kL eANuJygisCcjiiFWBc2bR6MMkzTwj4ZIQEuhc6QLvVcAFz1BSKuDToHvmeGWBNgyW4ktkLv7fhX kulafbMjdotJKhcHScUh1m9Wd4W40+y7MWRM5HyMRyNCg6voHpTMw2xHTZByLS47Hw4HKWHifPC omqUU22C33Zj9FcBT0FOWBpffdhaUwUdF1jXp/cPGDMn28P7Fh4dauytkUmT743IRKEJjVjbHwM Y0wcHYft+cwXjcHC4smvCxXQUj//139PtoHdah0v3cme/OsHECRB377hvHDlrVWM9F3/M8y4Fhy yfSbo= X-Received: by 2002:a05:6402:190a:b0:698:663d:d7bd with SMTP id 4fb4d7f45d1cf-6a42f1df94emr4732088a12.11.1787301578261; Fri, 21 Aug 2026 01:39:38 -0700 (PDT) X-Received: by 2002:a05:6402:190a:b0:698:663d:d7bd with SMTP id 4fb4d7f45d1cf-6a42f1df94emr4732055a12.11.1787301577772; Fri, 21 Aug 2026 01:39:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 5/9] scripts: introduce CrateSource abstract class Date: Fri, 21 Aug 2026 10:39:20 +0200 Message-ID: <20260821083925.2008135-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301639037158500 Prepare for making the script able to update .wrap files with versions from Cargo.lock. Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 49 ++++++++++++++++++------ 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index 8114f0731be..636e4ba3474 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -29,18 +29,36 @@ def get_name_and_semver(namever: str) -> tuple[str, str= ]: return parts[0], parts[1] =20 =20 -class UpdateSubprojects: - cargo_registry: str - top_srcdir: str - dry_run: bool - changes: int =3D 0 +class CrateSource: + """Class for locating crate versions and pointing wrap files at them. + Subclasses know where the source of a crate comes from and how to + rewrite the ``[wrap-file]`` to consume it.""" =20 - def find_installed_crate(self, namever: str) -> str | None: + origin: str + + def find(self, namever: str) -> str | None: + """Resolve a 'name-semver' prefix to a concrete 'name-version'.""" + raise NotImplementedError + + def rewrite_source(self, section: configparser.SectionProxy, orig_name= ver: str, source_namever: str) -> bool: + """Update the download-related keys of a [wrap-file] section.""" + raise NotImplementedError + + +class CargoRegistry(CrateSource): + """Locate crates already extracted in a local Cargo registry directory= .""" + + origin =3D "the Cargo registry" + + def __init__(self, path: str): + self.path =3D path + + def find(self, namever: str) -> str | None: """Find installed crate matching name and semver prefix""" name, semver =3D get_name_and_semver(namever) =20 # exact version match - path =3D os.path.join(self.cargo_registry, f"{name}-{semver}") + path =3D os.path.join(self.path, f"{name}-{semver}") if os.path.exists(path): return f"{name}-{semver}" =20 @@ -56,6 +74,14 @@ def rewrite_source(self, section: configparser.SectionPr= oxy, orig_namever: str, del section[key] return True =20 + +class UpdateSubprojects: + cargo_registry: str + source: CrateSource + top_srcdir: str + dry_run: bool + changes: int =3D 0 + def compare_build_rs(self, orig_dir: str, source_namever: str) -> None: """Warn if the build.rs in the original directory differs from the= registry version.""" orig_build_rs =3D os.path.join(orig_dir, "build.rs") @@ -102,7 +128,7 @@ def update_subproject(self, wrap_file: str, source_name= ver: str) -> None: return =20 section["directory"] =3D source_namever - if self.rewrite_source(section, orig_dir, source_namever): + if self.source.rewrite_source(section, orig_dir, source_namever): with open(wrap_file, "w") as f: config.write(f) =20 @@ -110,9 +136,9 @@ def update_subproject(self, wrap_file: str, source_name= ver: str) -> None: config.write(f) =20 if orig_dir =3D=3D source_namever: - print(f"Installing {orig_dir} from registry.") + print(f"=F0=9F=91=89 Installing {orig_dir} from {self.source.o= rigin}.") else: - print(f"Replacing {orig_dir} with {source_namever}.") + print(f"=F0=9F=91=89 Replacing {orig_dir} with {source_namever= }.") =20 subprocess.run( ["meson", "subprojects", "download", wrap_name], @@ -154,6 +180,7 @@ def __init__(self, args: argparse.Namespace): self.cargo_registry =3D args.cargo_registry self.dry_run =3D args.dry_run self.top_srcdir =3D os.getcwd() + self.source =3D CargoRegistry(args.cargo_registry) =20 def main(self) -> None: if not os.path.exists("subprojects"): @@ -164,7 +191,7 @@ def main(self) -> None: for wrap_file in sorted(glob.glob("*-rs.wrap")): namever =3D wrap_file[:-8] # Remove '-rs.wrap' =20 - source_namever =3D self.find_installed_crate(namever) + source_namever =3D self.source.find(namever) if not source_namever: print(f"No installed crate found for {wrap_file}") continue --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301647; cv=none; d=zohomail.com; s=zohoarc; b=lznzY6YDJTZ1nsG2T187j6vyw78doPrDRgJemeLu5y1RGHeXfO3Z2ZdDQ2VkbC6vEQCpCQK1exONaDEViGENO5ZT1yl6NAeU9t42tHKKDaF1gXLzzbXDPEm4u4CuTMFDqWplLaR+TKflXHK90ZOCfL68f436Hdb4+nVcHMYxzUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301647; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=M2i19n0p9YgArVOv8vKeFeUdAlRf+ZdvKQUP5HpsMcQ=; b=WhzUBpPV5C2duA0Dj6iYOPrUwcocZ3CuXwMuLK5/RDq2DXaKhQCICDqFBgbsFlrG1eTJ9Jx06NPu2G3nHVXGepXshrUaqVCipNzdTLL17gZ6GpmfDr+Uga69zz+j3bxqZ39IVB4Zpocip+qLEKmFbP5DBg/EekzyG7gIsMBgdDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301647631980.280006020512; Fri, 21 Aug 2026 01:40:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKn0-0005CL-Et; Fri, 21 Aug 2026 04:39:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmz-00058P-04 for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmw-0008Kp-Eg for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:48 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-219-JmhSiJ2sMkaMcShi5ouehQ-1; Fri, 21 Aug 2026 04:39:43 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-69cd6606b19so708989a12.1 for ; Fri, 21 Aug 2026 01:39:43 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3ff177859sm5193106a12.27.2026.08.21.01.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M2i19n0p9YgArVOv8vKeFeUdAlRf+ZdvKQUP5HpsMcQ=; b=MABi4AUX+ncpRtaeOn5QbNsid4FN7DtKGfbYqap8y8Nn4SeCvwtNBSrc3SqD3pI9g9LMG4 T2R/MTA3SpgEyXCC62M6mb2OhbUKMN/oz0NM6syx+Rrks6UHrA5B1w7C97LdIHzfncd6YX EDJ3Seeyb/bLSjfM9DEEuQwCDirNpU4= X-MC-Unique: JmhSiJ2sMkaMcShi5ouehQ-1 X-Mimecast-MFC-AGG-ID: JmhSiJ2sMkaMcShi5ouehQ_1787301582 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301582; x=1787906382; darn=nongnu.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:content-type; bh=M2i19n0p9YgArVOv8vKeFeUdAlRf+ZdvKQUP5HpsMcQ=; b=XK1Dncjivzda8oKMmzOsImpFlaKP90T011qQny8IMkq5JAdaWW2KtG5mKY/UyicaX+ MIcPOui4rsWzUsqIiifA95/EwqJOX/YAji5L9M84Syo0TjYDhmOSYeCN/UGpTlYM0uXi JSF6QwWjkeMrDLLDGuIcdAx0HNpMUpe35/EaaXwiLZyxhSfmTbsSw0ULY2IbbYYMw1dT ov7qLpZEyBpbPWM60ts043jGMahYSMgq7iuKCCaEXfo/D7UTo18s8l4yiPmiKqSSiaoh TAErr0PO7bOIs7A8M2l4yh0lA+13Rnqxxc5LstuOOdivojINUpApoLX7O9uf5sTCqGPJ nGEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301582; x=1787906382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=M2i19n0p9YgArVOv8vKeFeUdAlRf+ZdvKQUP5HpsMcQ=; b=MeMLIT2W97uzUVnePDwV90YVGLk7RMJjKBVRILPWZgY0vk8dW70qb/4Tg16DBjX/Wm yxqT8XZZNbVHoTysb4okr2A0/qrYEWqTj9eSHXeC6gJcxVPZSD1EudRQewyIaPuClIVn D1WHRV/pCE/NcbA/ZI1n+4V7h0a9FL3FVH3WY8tElkUkyttGXrsS4y8L7j0sG+vDxYvK tUuR1Sl4IfXMeecUKbY0eAvn9JbkJ6RkJRE5cIOkxcL2440EblsDdtCEJ7T3OO6h+x4Y cstp4Kh80iWi3ixVDqnyqu+FcbIKxq2fDQkIqi9rujEL5xA8ZnhbfyRjfJlk7CD5CG1d 7RRg== X-Gm-Message-State: AFuF++l/nDcykqxyQy2Spt3Wvp3lVADyEBbFBQ3NuxUqHl6ADIwHBjis MK5Blx3tcRrgxGFuWpIrxOJpF1j/Fx8Pex5vYAzqLW7SYiEdVQLo1JLEa82knszH55T2jWxRLIs 8dcV3vEWmCG53kFkH+4ihwRfImT/H0HZBajTJU+nDrWk94SNiAZ2pvHBvefkzly/BQFDfyJesa8 iyHnwIf4xp4gtnkeMzMOKvBhBPL0Ab1tPFmvsQWugn X-Gm-Gg: AR+sD11rEH5pnsyOzKykPJdq5AqS9pL8kRmaXeZ3JiM9X189bcyCe0hjod5ICkcM0g9 bj4ELmRWosQoT03j9OhOpjc6ShFopdFmIISaakAe7Bub3O7DQucymnuPR/EC35EkuXi8xpW8/kz xbuDwdG8AYWPWMDOvNUoqsa9pag8JSXHJJqmfA3WNu0/mMDIbMt+3Ua2L8+yd84MzrXsFimtGPL 49oxJAvXt2TQK8bCM3cZVBynEMCt+ONh+NdsajBpR7j0PTGZh5OTNmSMzkCGHJTRzWQwC6Jc8Lx dC2KNHIMafh1ydCsJKXCjF1UaQboltGpcDZjzzmEChO0AwukPtEOG3sd5Va14slveDvwJQau1CU W49RjKVhr5RYrXEQf2e7YDQCG6hs8j6yyHbLFs+sCYcxmAVUPqKW+YQnYaosyBOzbQXKZq0cxgA NAMp8= X-Received: by 2002:a05:6402:43c5:b0:6a3:8652:a373 with SMTP id 4fb4d7f45d1cf-6a42f184819mr5437370a12.3.1787301582258; Fri, 21 Aug 2026 01:39:42 -0700 (PDT) X-Received: by 2002:a05:6402:43c5:b0:6a3:8652:a373 with SMTP id 4fb4d7f45d1cf-6a42f184819mr5437315a12.3.1787301581799; Fri, 21 Aug 2026 01:39:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 6/9] scripts: add functionality to update wrap files from Cargo.lock Date: Fri, 21 Aug 2026 10:39:21 +0200 Message-ID: <20260821083925.2008135-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301654922158500 Content-Type: text/plain; charset="utf-8" .wrap files and Cargo.lock contain pretty much the same information. QEMU uses the former to make it easier for distros to use a local registry, and also because Meson <1.13 does not use Cargo.lock for the "meson subprojects" command. This however introduces an inconvenience when running "cargo update", in that the wrap files have to be updated by hand. Add the possibility to get new versions from Cargo.lock and not just from a local registry, thus automating the update. For now, only existing wrap files are modified. This means that semver-breaking updates need to be done (at least partly) by hand; it is enough to rename the wrap file prior to running the script. While the need for this script is a lot smaller with Meson 1.13, it would still remain useful for packages that have a patch directory. Perhaps a bit overengineered, but since we have it... Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 77 +++++++++++++++++++++--- 1 file changed, 69 insertions(+), 8 deletions(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index 636e4ba3474..b3ae5a2c284 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -3,7 +3,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 """ -get-wraps-from-cargo-registry.py - Update Meson subprojects from a global = registry +get-wraps-from-cargo-registry.py - Update Meson subprojects from a Cargo +registry or from the versions pinned in Cargo.lock. """ =20 # Copyright (C) 2025 Red Hat, Inc. @@ -18,6 +19,7 @@ import shutil import subprocess import sys +import tomllib =20 =20 def get_name_and_semver(namever: str) -> tuple[str, str]: @@ -75,6 +77,49 @@ def rewrite_source(self, section: configparser.SectionPr= oxy, orig_namever: str, return True =20 =20 +class CargoLock(CrateSource): + """Locate crates by the versions pinned in a Cargo.lock file.""" + + origin =3D "crates.io" + + def __init__(self, path: str): + with open(path, "rb") as f: + data =3D tomllib.load(f) + + self.versions: dict[str, list[str]] =3D {} + self.checksums: dict[str, str] =3D {} + for pkg in data.get("package", []): + # workspace members have neither a checksum nor a crates.io ta= rball + if "checksum" not in pkg: + continue + name, version =3D pkg["name"], pkg["version"] + self.versions.setdefault(name, []).append(version) + self.checksums[f"{name}-{version}"] =3D pkg["checksum"] + + def find(self, namever: str) -> str | None: + """Find pinned crate matching name and semver prefix""" + name, semver =3D get_name_and_semver(namever) + versions =3D sorted(self.versions.get(name, [])) + + # exact version match + if semver in versions: + return f"{name}-{semver}" + + # semver match + matches =3D [v for v in versions if v.startswith(f"{semver}.")] + return f"{name}-{matches[0]}" if matches else None + + def rewrite_source(self, section: configparser.SectionProxy, orig_name= ver: str, new_namever: str) -> bool: + # rewrite the download keys to fetch the pinned version from crate= s.io. + if orig_namever =3D=3D new_namever: + return False + name, version =3D get_name_and_semver(new_namever) + section["source_url"] =3D f"https://crates.io/api/v1/crates/{name}= /{version}/download" + section["source_filename"] =3D f"{new_namever}.tar.gz" + section["source_hash"] =3D self.checksums[new_namever] + return True + + class UpdateSubprojects: cargo_registry: str source: CrateSource @@ -104,12 +149,13 @@ def compare_build_rs(self, orig_dir: str, source_name= ver: str) -> None: print(" This may affect the build process - please review th= e differences.") =20 def update_subproject(self, wrap_file: str, source_namever: str) -> No= ne: - """Modify [wrap-file] section to point to self.cargo_registry.""" + """Modify [wrap-file] section to use the crate resolved as `source= _namever`.""" assert wrap_file.endswith("-rs.wrap") wrap_name =3D wrap_file[:-5] =20 env =3D os.environ.copy() - env["MESON_PACKAGE_CACHE_DIR"] =3D self.cargo_registry + if self.cargo_registry: + env["MESON_PACKAGE_CACHE_DIR"] =3D self.cargo_registry =20 config =3D configparser.ConfigParser() config.read(wrap_file) @@ -157,9 +203,15 @@ def parse_cmdline() -> argparse.Namespace: parser =3D argparse.ArgumentParser( description=3D"Replace Meson subprojects with packages in a Ca= rgo registry" ) + parser.add_argument( + "--cargo-lock", + action=3D'store_true', + default=3DFalse, + help=3D"Update wraps from Cargo.lock", + ) parser.add_argument( "--cargo-registry", - default=3Dos.environ.get("CARGO_REGISTRY"), + default=3DNone, help=3D"Path to Cargo registry (default: CARGO_REGISTRY env va= r)", ) parser.add_argument( @@ -170,9 +222,15 @@ def parse_cmdline() -> argparse.Namespace: ) =20 args =3D parser.parse_args() - if not args.cargo_registry: - print("error: CARGO_REGISTRY environment variable not set and = --cargo-registry not provided") + if args.cargo_registry and args.cargo_lock: + print("error: --cargo-registry and --cargo-lock are incompatib= le") sys.exit(1) + if not args.cargo_registry and not args.cargo_lock: + args.cargo_registry =3D os.environ.get("CARGO_REGISTRY") + if not args.cargo_registry: + print("error: CARGO_REGISTRY environment variable not set = and " + + "--cargo-registry or --cargo-lock not provided") + sys.exit(1) =20 return args =20 @@ -180,7 +238,10 @@ def __init__(self, args: argparse.Namespace): self.cargo_registry =3D args.cargo_registry self.dry_run =3D args.dry_run self.top_srcdir =3D os.getcwd() - self.source =3D CargoRegistry(args.cargo_registry) + if args.cargo_lock: + self.source =3D CargoLock(os.path.join(self.top_srcdir, "Cargo= .lock")) + else: + self.source =3D CargoRegistry(args.cargo_registry) =20 def main(self) -> None: if not os.path.exists("subprojects"): @@ -193,7 +254,7 @@ def main(self) -> None: =20 source_namever =3D self.source.find(namever) if not source_namever: - print(f"No installed crate found for {wrap_file}") + print(f"No crate found for {wrap_file}") continue =20 self.update_subproject(wrap_file, source_namever) --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301672; cv=none; d=zohomail.com; s=zohoarc; b=XJbqbSIv+IQlCM5nbnCaf9JOr30sP77/PUOuT0ShKPHvueFUxN7EeCh8Dgi0oI8yq57AVDXdO7xYq0w1uxp3YKtzyXew3L3qe7gLt5ElkjjkcY7kp1HWT3Ny2NdAtTDDSSPMBKSDJ3lwdaPXBiCEjnurBa/Z3M6W8/Y8Ip5vKYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301672; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jEkhhmfARJthnU2Ad+S3BEdQZlV4xabCHmVmi7VfYGk=; b=FnD6Dby6SlcTfBEpY5/ZKUKZPa4FqSIZr7wMBzgwuuMHVHwgGKR6tQGFMXE/f/znNFJoRjAwkRj/Iyit6cMiixP8kiv1yfdeujtBWXv6R5WTRp8k09NBzhZbrUpqmK4gpcQgeSLX4zhGJmlFyrYLnbjVQMKTnikMcgrCGFYNnI4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301672116332.0604337545816; Fri, 21 Aug 2026 01:41:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKn1-0005EF-UV; Fri, 21 Aug 2026 04:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmz-0005Be-RB for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKmy-0008LN-3R for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:49 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-127-9n1RwhKaNLC-sdX6_KuLqw-1; Fri, 21 Aug 2026 04:39:45 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-c15c6a68406so45346966b.3 for ; Fri, 21 Aug 2026 01:39:44 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c24589e224dsm363825566b.2.2026.08.21.01.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jEkhhmfARJthnU2Ad+S3BEdQZlV4xabCHmVmi7VfYGk=; b=Yqh1i/R+0RWvIy4DeFn90H00N2uuakx+aPWeZT5lQt7JilHd0pWzND7cDD/JVAZS/S0+10 O9KM9MPunyDfnSltre46KK9bqJD0cxfzsNp6YJeMt/zGv1HoQHIIxBYQk+NPHx4dC09f1g 7+yWlOVypSGZEJpkTVM8JxekiZiNztw= X-MC-Unique: 9n1RwhKaNLC-sdX6_KuLqw-1 X-Mimecast-MFC-AGG-ID: 9n1RwhKaNLC-sdX6_KuLqw_1787301584 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301584; x=1787906384; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=jEkhhmfARJthnU2Ad+S3BEdQZlV4xabCHmVmi7VfYGk=; b=OI3LniH7huxRBl6kNLWBzVBy4S8TXJ/bVow22SQ46i7w6nHRcVKYPdEGWKrgGoufdS 7TrLUBMb0pYrMDQfdCYCdMsgxm637E1Y23BiKs7K+CnWmPniei1E+Izk9ZbGN20pUT6/ fKscc5iWlc8o+KLQ2jPBekNg05N1wbRgUFDvRZCSjDaOEi97JP35OMsNQmYQ2u6Q5Vrs 72Qh72misSk/pN9rP1K1lXUjmwueKvtVJ1mB1JRo9keqD8bpgn4ORieL9DmCi7j8rcyw lGhEjN5RWlFwwTvMjtmIZL/2rRfhRSs7tcwmgYmcyGXASH8V1ISAiuBxAHn5gaSdrB4M I8fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301584; x=1787906384; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jEkhhmfARJthnU2Ad+S3BEdQZlV4xabCHmVmi7VfYGk=; b=qwybFkbK9lJ3yFAQ1agob7idO7HI78JlcL2cEZuMmk400CKB4aPfjRHHAHYgvimeAJ 3sQAyjcwqfwATB/lY5hexF+/ZprrrI7EAhGBInoXAmrUfo/mWZlX4N3Y7xoiLD5clw3D uRl3Fi0PKxZ7+PLLOW/9fYDa0qzXv/YEoewdRA+03gsQVwwoPkmdSYrqaupvpJBnsTnh e/mNNxUOOiCo+Clw6UsLOJ4cY013HAEMs2DUn4CbQ+MK81aWyBUnAKkpm5b8UXIzNwtI u81UiWFPE1sjFPzwfKRmF1MzlPl9jyTPuoEAoYTbzbjj2r8r/NO74aZXFtofzVlUVkYm JJBQ== X-Gm-Message-State: AFuF++nk4BwIn8mirGIy5wp76c1wPE3YK/ZXlfr9Pt03WX4IXY8UQhMY BrY1hTL2mmLLbKGar4bM1BtoSGm/2hwKHhEM6PBUkP1M61Fhvsj2zjGEXY/ctLalKoqO+SaYndh StnxJGkR1NwP9CaA2cyjwtFOWDeaJJZcq4+TpZhCZ8fS9JLI0l4sfSKxR57ncOLNglnroMCkR0u qMVV3dkndeS+gM+XxJ+qDoutMRlV9ywxJsTbi449Lo X-Gm-Gg: AR+sD10fYOEs1xcqJBxptMD0CUEOF5Hn3JsiZ+LOYQoDkjtAifw3FWUFye0J64VlqiH cxqAcYYKOqTBge21+lxPlQQ8AYndkEpsiMg1SzyDwz2sx/grDDz01DFGeE6ABqkWZqkuu2kBGQT hqpBlDJFGZy1i30lNJSrrjauEfUUdWKQqfUTAcYWQ0xnRF00yFAPXTcaWaOGulpaqROuB1KdouC d+rwYoYYXxjuW6TBMKeJv7yZg8NBHVUvaAFrXhAtmeMEU3f1ijVhcoA1H75haeTfiMeA3oWgxps g6z1zITwaZ6AU77kWJlhgPYGj9sIuemwXUJH2QTLA1wLWSz5hp4IiMaUH4R84D1HQsHh0bBR2xQ GYbx9X8FJnsJb9VL2hUYErNrubduUjV8V/cWhZAReSgLXComDBu1FXpBeebpGWTa7LD4tTps6g0 H3LoU= X-Received: by 2002:a17:907:9628:b0:c16:13e7:fd63 with SMTP id a640c23a62f3a-c2469f94a1bmr483606366b.0.1787301583879; Fri, 21 Aug 2026 01:39:43 -0700 (PDT) X-Received: by 2002:a17:907:9628:b0:c16:13e7:fd63 with SMTP id a640c23a62f3a-c2469f94a1bmr483599966b.0.1787301583427; Fri, 21 Aug 2026 01:39:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 7/9] scripts: add the possibility of a quick update of the pacakge Date: Fri, 21 Aug 2026 10:39:22 +0200 Message-ID: <20260821083925.2008135-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301672926158500 Signed-off-by: Paolo Bonzini --- scripts/get-wraps-from-cargo-registry.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/get-wraps-f= rom-cargo-registry.py index b3ae5a2c284..a26fe135eb9 100755 --- a/scripts/get-wraps-from-cargo-registry.py +++ b/scripts/get-wraps-from-cargo-registry.py @@ -166,10 +166,13 @@ def update_subproject(self, wrap_file: str, source_na= mever: str) -> None: orig_dir =3D section["directory"] =20 if self.dry_run: - if orig_dir =3D=3D source_namever: - print(f"Will install {orig_dir} from registry.") - else: + if orig_dir !=3D source_namever: print(f"Will replace {orig_dir} with {source_namever}.") + elif not os.path.exists(orig_dir) or self.cargo_registry: + print(f"Will install {orig_dir} from {self.source.origin}.= ") + else: + print(f"Will update {orig_dir} from cache.") + return self.changes +=3D 1 return =20 @@ -181,10 +184,19 @@ def update_subproject(self, wrap_file: str, source_na= mever: str) -> None: with open(wrap_file, "w") as f: config.write(f) =20 - if orig_dir =3D=3D source_namever: + if orig_dir !=3D source_namever: + print(f"=F0=9F=91=89 Replacing {orig_dir} with {source_namever= }.") + elif not os.path.exists(orig_dir) or self.cargo_registry: print(f"=F0=9F=91=89 Installing {orig_dir} from {self.source.o= rigin}.") else: - print(f"=F0=9F=91=89 Replacing {orig_dir} with {source_namever= }.") + print(f"=F0=9F=91=89 Updating {orig_dir} from cache.") + subprocess.run( + ["meson", "subprojects", "update", "--reset", wrap_name], + cwd=3Dself.top_srcdir, + env=3Denv, + check=3DTrue, + ) + return =20 subprocess.run( ["meson", "subprojects", "download", wrap_name], --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301629; cv=none; d=zohomail.com; s=zohoarc; b=C/yQWvPQ5u6RWo8a/mc31YeS8OHcTt4sr1KiXIYRuKKf1xavMwgtsJrWW7zy0TovA5xpZI14664bX+Hscdh+k8Afvpjrde4xZJ79Y7usrUVRE6eNx+lYOqDyfyr1LGRIIyBla1+vZWGDa24a4vS3c1UXs7agKUcqmk9B44USbU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301629; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MWxQH9gL9sLdexucta7qH+Siu5S42ahcdZRs44zuXqY=; b=XrrybjZk/2GFdZtvHAgKYWvWrAW9qmf1MXHci1ErZIMTt6xdNzXZ8gEJPzzh1FgftnkMBVfcI5JsuNYTZ6nsfkrlFDegql8vEZTujIqejghDlMQGbUIhNVgtc0An9ie0PXWDgRtoCFdtXiNQgv6V64gthjHfP7ebCnzuoHPzHZc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301629856543.2718789673155; Fri, 21 Aug 2026 01:40:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKnB-0005fS-P2; Fri, 21 Aug 2026 04:40:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKn9-0005XD-6j for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKn7-0008OG-Mo for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:39:58 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-281-dDK5RTX7OC6Fq-Qh9NqfPQ-1; Fri, 21 Aug 2026 04:39:49 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-c15e555a164so59654566b.1 for ; Fri, 21 Aug 2026 01:39:48 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2458b05dcfsm320054266b.14.2026.08.21.01.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MWxQH9gL9sLdexucta7qH+Siu5S42ahcdZRs44zuXqY=; b=UzU6T4zExyjA2AdJ0Uau4cpVIGoqhKY+nkRRLPWQbgz/ANnx2OjVNgNwN7nxTGN8Ka/FLt pr/gib2EMgqNHMt44mFC+OZ6MiLvfet4iVAL4lup7fdqZqd5+fw3FJv+ZPfRZdbk1Bg0IV /FD2Q37znCDEBRyc3rg+TNhXhAGSaRo= X-MC-Unique: dDK5RTX7OC6Fq-Qh9NqfPQ-1 X-Mimecast-MFC-AGG-ID: dDK5RTX7OC6Fq-Qh9NqfPQ_1787301588 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301588; x=1787906388; darn=nongnu.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:content-type; bh=MWxQH9gL9sLdexucta7qH+Siu5S42ahcdZRs44zuXqY=; b=cH5Cy+RSC0tYt9XsA8LVgr50rpkOLJgunXdMF4HMQoO12rlSzv1F5WBA5zlEs+mxwS A7L2GwrA8bQqVlks7qzWAMq2vtl2VkrmmMDehpujedawtgoduTzTK5U2DuB6j/4qP1QJ 7GNX4uINC0hjWDflNpifiqofGiyKI9i+YLxpBiSauqPBYNS7azHJ8qT3qadkdn/i+mxL yJPCp/OcYLvV1ek6wUnHHt6oq2CfN947p8T55uAA/acAk6Uk25xsxovU9Tl9dsF5O8W5 /xoz9dAA2GxVCvz2S4yMvORKYUYFyXzkPXtd481ne4p070Bm7cUDapXOTUU6DbsDPLlb rrog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301588; x=1787906388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=MWxQH9gL9sLdexucta7qH+Siu5S42ahcdZRs44zuXqY=; b=Cfavwo+SfKXQVvjFIgJAorP+L160ODR/Gwcv/w8+VHGQWJ7cZ0LXf3n+RgxQrLYhgO FRi9C7GAFOCQZSfmv59stUk01k42nY52BQTbgikM/8K8mJLzbxcaSGTigZ5Rd7YmtKzA b6LRMG5IEdCbzzPTThl+O3ZPXuNv+nS/fM7nMbQtDyywyvN2jrxi4hZ0Jl6c3xuvZ7Cg Ci3KhE3kKd7hQwvbLmfucmMOuUoenB+hChtiBVJWBTta3IH5bRLRCm9cey/k8Q+9b2Gy WP4oI+ldpIXV3PyHQPN9sWCHyCdS0cXLEMwFhExzFZYsAiWnZB+Ky4FENUYP3VXjXq2C FzPQ== X-Gm-Message-State: AFuF++nBZH/f4RfuqT9P2UYVeBKv+p1tWJzWcVasU2k3um1VaFPMoi1C x8Si6+F5L4UxVhW4qmxsURUsp1Ri7ujFZfbY88HNKEzj3kIcqvS5upHyap6aM6WCZEF18C2Dzk1 dwWh7jp1ClpZDeY7beo/at30RdxowYNofkdhb788P0zrh90Wh1wkNTN6ZqOWYSk/xEcxl+7dIO0 VXr3eEP0O2VfHch/TuFMjXlwHM3vrsR5DdrA+3bp9k X-Gm-Gg: AR+sD10vDmPFuafhMckOy1EvCwtuVo40PByROfEQAU+vU4jFUBfSdD8R2nWOvplXb4S +IMrWp9pDWKDwxI0tETvFWUb4SMcjRRXQt5a/jiE+YMb23zYKTrgFlDIfB1Yt7lvsQWQJw9rClU 0+UH6VukWAnDdCWKeHLr14RxanFkboAF2PG4KXNfNQ4uvhTOxxWI3RjPJAZRdM1SMOyxXCEbc7W 1DVuzD9NF+6vmwvTrJtPejF4XDfRMj89mYHSr8r1GbkgH9nxbC4KRBcfNWCw++PfRX1oRwFbiEX egsLUQZHnbRUCyYbpZj6mKBjOTlJ/v9UjV9wq9PUGov7SJruJas/STT/fMsSBcTs6RpiEJu8vlh MgpCg6rj3RQvFj6YSxPozzC3cqk9+PdY8+Vs1CUMWQL/HBnW7m1NTWVjUDP2unnSz3wVFzx5UCp coEaI= X-Received: by 2002:a17:907:9345:b0:c24:6382:2648 with SMTP id a640c23a62f3a-c246d633d8amr363681866b.5.1787301587891; Fri, 21 Aug 2026 01:39:47 -0700 (PDT) X-Received: by 2002:a17:907:9345:b0:c24:6382:2648 with SMTP id a640c23a62f3a-c246d633d8amr363676766b.5.1787301587385; Fri, 21 Aug 2026 01:39:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 8/9] scripts: rename get-wraps-from-cargo-registry.py Date: Fri, 21 Aug 2026 10:39:23 +0200 Message-ID: <20260821083925.2008135-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301630950158500 Content-Type: text/plain; charset="utf-8" It does more than that now. Signed-off-by: Paolo Bonzini --- .../{get-wraps-from-cargo-registry.py =3D> update-cargo-wraps.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{get-wraps-from-cargo-registry.py =3D> update-cargo-wraps.p= y} (100%) diff --git a/scripts/get-wraps-from-cargo-registry.py b/scripts/update-carg= o-wraps.py similarity index 100% rename from scripts/get-wraps-from-cargo-registry.py rename to scripts/update-cargo-wraps.py --=20 2.55.0 From nobody Fri Aug 21 21:28:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1787301628; cv=none; d=zohomail.com; s=zohoarc; b=knICE0IdJeyOryb56vv5n52P+SN3krhJkY4n76FSRN6390EAJrRKKSpyVaoLmU4qbpocFzDEuTuKpeHgWa3DJbeUN6YDimUKK14QDCM67dcgKTAm0s4mSAERrnXEdi8FDgCgo7nCOyWPpUMqhY34pIq7ptO5E+yW7Mu1R737QrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787301628; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yH5UkosYjM5QnJdd077iiA8YnDBeS9StdFSji5GO7W8=; b=DnRdGmCxPXmB1mwOYnhf1tl5xNr4mhEKKshu35mUjlCFFcxt9vIedbL2Lu1hXT1fjc3Jznd5/KoU1unkAQHXcYLUXD91J5W5Kyg2Yi7y0eSf7HMb0bogDATaA2drs7kYK2ZZd0ECEVXZvdZsh6Fe0Iv5BgVcuMtXgS20fHjtqv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787301628803158.52827183162708; Fri, 21 Aug 2026 01:40:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wxKnE-0005mW-M9; Fri, 21 Aug 2026 04:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKnC-0005iD-Ky for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:40:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wxKn9-0008Pb-W3 for qemu-devel@nongnu.org; Fri, 21 Aug 2026 04:40:02 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-264-hjAY9yBjNq-fEtpBblXgXQ-1; Fri, 21 Aug 2026 04:39:51 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-c1630a90890so50769066b.1 for ; Fri, 21 Aug 2026 01:39:50 -0700 (PDT) Received: from [192.168.10.48] ([151.95.34.92]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c24591df465sm344065266b.48.2026.08.21.01.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 01:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787301599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yH5UkosYjM5QnJdd077iiA8YnDBeS9StdFSji5GO7W8=; b=KiqD1YzvUY0UBPVcehQHS3uoGtmAcacxJFWsVfgU6Xt5dH/YJEJwP175xVIkrMVkfwVUt9 mrS4V/9C9YY8Z7VtPsvjEeoJHQf8LKEOTJTCJwU5MYKFGhgy5pvNNlb6uUOx8oikaFdaKL LzQorBcNVyCpJHOkF2Paiios4NBg3hQ= X-MC-Unique: hjAY9yBjNq-fEtpBblXgXQ-1 X-Mimecast-MFC-AGG-ID: hjAY9yBjNq-fEtpBblXgXQ_1787301590 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787301590; x=1787906390; darn=nongnu.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:content-type; bh=yH5UkosYjM5QnJdd077iiA8YnDBeS9StdFSji5GO7W8=; b=k9vo/N6bAx/Mw72u73UhZRQErUUXjOArW+bNM8TRMYtZMrqup4dfWl7WYWAHGJOKa/ WF1OgyTynvuwQYCvhWqyf5KEOF8hO1ogaWCbPjIf5L4bys5nhXuIIOTLAio97qTImoSz mGwRTxjgljF06LuL9BTvaXVapucqUOuWjc6IvDJRDHjtDTHuD/Ctre5mcd5ofrVYm37o eVO826EO3Xp+MwLp2coIMUK9oaAWN/A1LjHuvAGkaE4vIiJeM874DML3Ec5VvzrnO7vG doAgLdUIO+DvIc5WCVLz1tdlQv0urRWwdCrjFp7FtAAWbyhdIzktfs2SY4Q4LVsCtGDQ RTJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787301590; x=1787906390; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=yH5UkosYjM5QnJdd077iiA8YnDBeS9StdFSji5GO7W8=; b=F5ZZkrxokQn4I83eCYB361jvLJD1/jpVnKdVfZZsMze0IORlhXgx3aRsArnCJRjLrR lhvGAGB+pORC6QUC2Ik1Zm0EJ2Fsnj4fBsFSNQMe47G6XYGfSQu4tjwHBfRTwGchAmxT 2weNNSeXbObn/pbfabP7w4ki2WyinM1guC9JpBsG/9t3NhOibzw7zkvDHdzbDqGtUiKV PTdaAVv4sSfhfGurZZ4bEpXXzaJCtm8wAMJ7SObjyNMveM0VUNSkuzt4n65MBZUm90Jb k3XABElWwZ3nd/fvWWN2i5/fiivBXRSB9CcIOW1rb2cncdEgLjfieFLctpHT3LIE8Zhx U8CA== X-Gm-Message-State: AFuF++lpnDCEw1Vjo5d/NioLYgavDsiQj1s3zfpIwsWlXg1d8w3zFoTP kbAKW8SvgVzmBKo/S1xRZMGfFPjQNtZDxvPTlNlB8uLkcKh8r9CHzVfWUsW+J2o6pE78L58Ull4 QPxySSHKsHmuEIqRdlwmRRZcMxsbuLmQr2mWWCEuvMNlDa2lYxZ1ynSEJ7KzKzufnX9vC/Wj8CY 1FeiONKYJt/+qPXVxOZQ4QzZbPu5l290Ydy1MZxFNV X-Gm-Gg: AR+sD10+8+pt4nUUIhU5HgMkSxJYi76DHfs4iyhLDbxYIIP26EDQm+/JScyTpGVLMTJ Fq0bwu+vBNWSNyOrnINsf9f3mSyY0/91BBnLHxxoDxf01OU+dR67aulKkXsaetpS8Xm3CcvHPOo bKgeANLNWW0ILqguNEtimmD8VUHrwkJQHb8QHlQBJDDOirDZTsJF7eKX+mba3UPkwaGvWK40fVy xOB4r5qLKC5onzGEDQ1SCHb501jpK5gafHlzkuSnzwPCkwpIuQQvRu67nocTzzokQM/ghLJycG0 plFEsL+xvLy9M8xbqrNqxUpLnh+29J4dGXSxwoiNRyYupKLPqct53mX7RY5rSIdKvusBguyBxWh LkA2tJ5e4OTuwhxdi1b1ccdJe+pHgfx8BMsOI2ZwCm+NuJLbQrdH39z9opDGD+ilYCiGO0nGBTn 8dKB0= X-Received: by 2002:a17:906:81d8:b0:c16:12ff:dc93 with SMTP id a640c23a62f3a-c246a6ca584mr419161166b.18.1787301589659; Fri, 21 Aug 2026 01:39:49 -0700 (PDT) X-Received: by 2002:a17:906:81d8:b0:c16:12ff:dc93 with SMTP id a640c23a62f3a-c246a6ca584mr419158366b.18.1787301589039; Fri, 21 Aug 2026 01:39:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 9/9] rust: update crates Date: Fri, 21 Aug 2026 10:39:24 +0200 Message-ID: <20260821083925.2008135-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821083925.2008135-1-pbonzini@redhat.com> References: <20260821083925.2008135-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.346, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1787301631050158500 Content-Type: text/plain; charset="utf-8" Until a new version of bitfield-struct is released, skip the ones that introduce a new dependency on syn 3. Signed-off-by: Paolo Bonzini --- Cargo.lock | 48 +++++++++---------- Cargo.toml | 2 +- subprojects/attrs-0.2-rs.wrap | 9 ++-- subprojects/foreign-0.3-rs.wrap | 9 ++-- ...sys-0.21-rs.wrap =3D> glib-sys-0.22-rs.wrap} | 9 ++-- subprojects/libc-0.2-rs.wrap | 10 ++-- .../libc-0.2-rs/meson/meson.build | 20 ++------ subprojects/quote-1-rs.wrap | 10 ++-- subprojects/unicode-ident-1-rs.wrap | 10 ++-- 9 files changed, 56 insertions(+), 71 deletions(-) rename subprojects/{glib-sys-0.21-rs.wrap =3D> glib-sys-0.22-rs.wrap} (13%) diff --git a/Cargo.lock b/Cargo.lock index ad664a812d2..acf5516c5c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum =3D "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e8= 5f964c2404b969bdcd487" =20 [[package]] name =3D "attrs" -version =3D "0.2.9" +version =3D "0.2.10" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "2a207d40f43de65285f3de0509bb6cb16bc46098864fce957122bbacce32= 7e5f" +checksum =3D "60e397c905850173fdc02285fe7f94f1b0c3ff55ff6e103efbe98074d806= 01c4" dependencies =3D [ "proc-macro2", "syn", @@ -46,9 +46,9 @@ dependencies =3D [ =20 [[package]] name =3D "cfg-expr" -version =3D "0.20.3" +version =3D "0.20.8" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "1a2c5f3bf25ec225351aa1c8e230d04d880d3bd89dea133537dafad4ae29= 1e5c" +checksum =3D "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835= 997c" dependencies =3D [ "smallvec", "target-lexicon", @@ -93,18 +93,18 @@ checksum =3D "877a4ace8713b0bcf2a4e7eec82529c029f1d0619= 886d18145fea96c3ffe5c0f" =20 [[package]] name =3D "foreign" -version =3D "0.3.1" +version =3D "0.3.2" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "17ca1b5be8c9d320daf386f1809c7acc0cb09accbae795c2001953fa5058= 5846" +checksum =3D "bec05eb9c07a3f66653535e5e50eb5eb935eb00d3bb7e06ea26a9d3a1d01= 6182" dependencies =3D [ "libc", ] =20 [[package]] name =3D "glib-sys" -version =3D "0.21.2" +version =3D "0.22.8" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "d09d3d0fddf7239521674e57b0465dfbd844632fec54f059f7f56112e3f9= 27e1" +checksum =3D "030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c595= 2233" dependencies =3D [ "libc", "system-deps", @@ -175,9 +175,9 @@ dependencies =3D [ =20 [[package]] name =3D "libc" -version =3D "0.2.162" +version =3D "0.2.189" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef0150= 6398" +checksum =3D "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee728676= 12f2" =20 [[package]] name =3D "migration" @@ -202,9 +202,9 @@ dependencies =3D [ =20 [[package]] name =3D "pkg-config" -version =3D "0.3.32" +version =3D "0.3.34" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b= 904c" +checksum =3D "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f1180= 0548" =20 [[package]] name =3D "pl011" @@ -272,9 +272,9 @@ dependencies =3D [ =20 [[package]] name =3D "quote" -version =3D "1.0.36" +version =3D "1.0.47" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208ac= aca7" +checksum =3D "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd07= 9001" dependencies =3D [ "proc-macro2", ] @@ -366,9 +366,9 @@ dependencies =3D [ =20 [[package]] name =3D "target-lexicon" -version =3D "0.13.2" +version =3D "0.13.5" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5= a69a" +checksum =3D "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5= a6ca" =20 [[package]] name =3D "tests" @@ -386,9 +386,9 @@ dependencies =3D [ =20 [[package]] name =3D "toml" -version =3D "1.1.3+spec-1.1.0" +version =3D "1.1.4+spec-1.1.0" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d= 4c3c" +checksum =3D "3aace63f4bbcdfc2c965b059de67119c89c4017a70d633be6c104910f670= 56f5" dependencies =3D [ "indexmap", "serde_core", @@ -410,9 +410,9 @@ dependencies =3D [ =20 [[package]] name =3D "toml_parser" -version =3D "1.1.2+spec-1.1.0" +version =3D "1.1.3+spec-1.1.0" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb= 7526" +checksum =3D "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc= 4d56" dependencies =3D [ "winnow", ] @@ -433,9 +433,9 @@ dependencies =3D [ =20 [[package]] name =3D "unicode-ident" -version =3D "1.0.12" +version =3D "1.0.24" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0f= ee4b" +checksum =3D "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247= da75" =20 [[package]] name =3D "util" @@ -458,9 +458,9 @@ dependencies =3D [ =20 [[package]] name =3D "version-compare" -version =3D "0.2.0" +version =3D "0.2.1" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411= c98b" +checksum =3D "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8e= df0e" =20 [[package]] name =3D "winnow" diff --git a/Cargo.toml b/Cargo.toml index b35704faabe..693dccb73c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ authors =3D ["The QEMU Project Developers "] anyhow =3D "~1.0" foreign =3D "~0.3.1" libc =3D "0.2.162" -glib-sys =3D { version =3D "0.21.2", features =3D ["v2_66"] } +glib-sys =3D { version =3D "0.22.8", features =3D ["v2_66"] } =20 [workspace.lints.rust] unexpected_cfgs =3D { level =3D "deny", check-cfg =3D ['cfg(MESON)'] } diff --git a/subprojects/attrs-0.2-rs.wrap b/subprojects/attrs-0.2-rs.wrap index fef89ea9368..fdab9646207 100644 --- a/subprojects/attrs-0.2-rs.wrap +++ b/subprojects/attrs-0.2-rs.wrap @@ -1,6 +1,7 @@ [wrap-file] -directory =3D attrs-0.2.9 -source_url =3D https://crates.io/api/v1/crates/attrs/0.2.9/download -source_filename =3D attrs-0.2.9.tar.gz -source_hash =3D 2a207d40f43de65285f3de0509bb6cb16bc46098864fce957122bbacce= 327e5f +directory =3D attrs-0.2.10 +source_url =3D https://crates.io/api/v1/crates/attrs/0.2.10/download +source_filename =3D attrs-0.2.10.tar.gz +source_hash =3D 60e397c905850173fdc02285fe7f94f1b0c3ff55ff6e103efbe98074d8= 0601c4 method =3D cargo + diff --git a/subprojects/foreign-0.3-rs.wrap b/subprojects/foreign-0.3-rs.w= rap index 95d450397ee..3d49f5a85f4 100644 --- a/subprojects/foreign-0.3-rs.wrap +++ b/subprojects/foreign-0.3-rs.wrap @@ -1,6 +1,7 @@ [wrap-file] -directory =3D foreign-0.3.1 -source_url =3D https://crates.io/api/v1/crates/foreign/0.3.1/download -source_filename =3D foreign-0.3.1.tar.gz -source_hash =3D 17ca1b5be8c9d320daf386f1809c7acc0cb09accbae795c2001953fa50= 585846 +directory =3D foreign-0.3.2 +source_url =3D https://crates.io/api/v1/crates/foreign/0.3.2/download +source_filename =3D foreign-0.3.2.tar.gz +source_hash =3D bec05eb9c07a3f66653535e5e50eb5eb935eb00d3bb7e06ea26a9d3a1d= 016182 method =3D cargo + diff --git a/subprojects/glib-sys-0.21-rs.wrap b/subprojects/glib-sys-0.22-= rs.wrap similarity index 13% rename from subprojects/glib-sys-0.21-rs.wrap rename to subprojects/glib-sys-0.22-rs.wrap index ea4d5f66a58..8177da567d3 100644 --- a/subprojects/glib-sys-0.21-rs.wrap +++ b/subprojects/glib-sys-0.22-rs.wrap @@ -1,6 +1,7 @@ [wrap-file] -directory =3D glib-sys-0.21.2 -source_url =3D https://crates.io/api/v1/crates/glib-sys/0.21.2/download -source_filename =3D glib-sys-0.21.2.tar.gz -source_hash =3D d09d3d0fddf7239521674e57b0465dfbd844632fec54f059f7f56112e3= f927e1 +directory =3D glib-sys-0.22.8 +source_url =3D https://crates.io/api/v1/crates/glib-sys/0.22.8/download +source_filename =3D glib-sys-0.22.8.tar.gz +source_hash =3D 030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c5= 952233 method =3D cargo + diff --git a/subprojects/libc-0.2-rs.wrap b/subprojects/libc-0.2-rs.wrap index 6e225579795..2bdb7c1750b 100644 --- a/subprojects/libc-0.2-rs.wrap +++ b/subprojects/libc-0.2-rs.wrap @@ -1,10 +1,8 @@ [wrap-file] -directory =3D libc-0.2.162 -source_url =3D https://crates.io/api/v1/crates/libc/0.2.162/download -source_filename =3D libc-0.2.162.tar.gz -source_hash =3D 18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01= 506398 +directory =3D libc-0.2.189 +source_url =3D https://crates.io/api/v1/crates/libc/0.2.189/download +source_filename =3D libc-0.2.189.tar.gz +source_hash =3D 3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee7286= 7612f2 method =3D cargo patch_directory =3D libc-0.2-rs =20 -# bump this version number on every change to meson.build or the patches: -# v1 diff --git a/subprojects/packagefiles/libc-0.2-rs/meson/meson.build b/subpr= ojects/packagefiles/libc-0.2-rs/meson/meson.build index db9480ada1c..ba770a697f8 100644 --- a/subprojects/packagefiles/libc-0.2-rs/meson/meson.build +++ b/subprojects/packagefiles/libc-0.2-rs/meson/meson.build @@ -1,16 +1,4 @@ -extra_args +=3D [ - '--cfg', 'freebsd11', - '--cfg', 'libc_priv_mod_use', - '--cfg', 'libc_union', - '--cfg', 'libc_const_size_of', - '--cfg', 'libc_align', - '--cfg', 'libc_int128', - '--cfg', 'libc_core_cvoid', - '--cfg', 'libc_packedN', - '--cfg', 'libc_cfg_target_vendor', - '--cfg', 'libc_non_exhaustive', - '--cfg', 'libc_long_array', - '--cfg', 'libc_ptr_addr_of', - '--cfg', 'libc_underscore_const_names', - '--cfg', 'libc_const_extern_fn', -] +extra_args +=3D ['--cfg', 'freebsd12'] + +# TODO: linux_time_bits64, file_offset_bits64, gnu_time_bits64 are still u= nstable for glibc +# as of libc 0.2.189 diff --git a/subprojects/quote-1-rs.wrap b/subprojects/quote-1-rs.wrap index 5f38f56499e..c6360ceab43 100644 --- a/subprojects/quote-1-rs.wrap +++ b/subprojects/quote-1-rs.wrap @@ -1,9 +1,7 @@ [wrap-file] -directory =3D quote-1.0.36 -source_url =3D https://crates.io/api/v1/crates/quote/1.0.36/download -source_filename =3D quote-1.0.36.0.tar.gz -source_hash =3D 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208= acaca7 +directory =3D quote-1.0.47 +source_url =3D https://crates.io/api/v1/crates/quote/1.0.47/download +source_filename =3D quote-1.0.47.tar.gz +source_hash =3D 1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd= 079001 method =3D cargo =20 -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/unicode-ident-1-rs.wrap b/subprojects/unicode-iden= t-1-rs.wrap index 90aae02ba0a..2563f101d40 100644 --- a/subprojects/unicode-ident-1-rs.wrap +++ b/subprojects/unicode-ident-1-rs.wrap @@ -1,9 +1,7 @@ [wrap-file] -directory =3D unicode-ident-1.0.12 -source_url =3D https://crates.io/api/v1/crates/unicode-ident/1.0.12/downlo= ad -source_filename =3D unicode-ident-1.0.12.tar.gz -source_hash =3D 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec= 0fee4b +directory =3D unicode-ident-1.0.24 +source_url =3D https://crates.io/api/v1/crates/unicode-ident/1.0.24/downlo= ad +source_filename =3D unicode-ident-1.0.24.tar.gz +source_hash =3D e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf382= 47da75 method =3D cargo =20 -# bump this version number on every change to meson.build or the patches: -# v2 --=20 2.55.0