From patchwork Fri Nov 24 14:42:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 35179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40506C61D97 for ; Fri, 24 Nov 2023 14:43:08 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.138612.1700836986717791168 for ; Fri, 24 Nov 2023 06:43:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iBQNnt6F; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4083cd3917eso13638715e9.3 for ; Fri, 24 Nov 2023 06:43:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700836985; x=1701441785; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ySC4dDyweR5VFj2WS61RFNg+TxexzTf09mSnx81sP3E=; b=iBQNnt6FHjzoYnpthRWmCuOyMqw8ANeDBPEghevWbq0ZNbV4hgFt24NUP8IFIw51tO sUti27Yz2PhRopAbwVLpxrnsdxxkZnmSfYspAT1QCohcOfiD4K1v0P4U3zgZbjTSDHli 6jY2bEuNbNvXUaSb1q6RSS50cGSp9ObHtqnv+859b75pANEbbCCK2vZvSeQ3jES4qnBR GGfbcYSSYgYZZioTyFdUgQLmYlLKmRepL0sEnU8gTq+6kzMFyOYSPi43OEzc8W/Dw5EI wggpz0M++GFsN7pW3rp/s2SMmyJdhLKPj1sGQdU99g88MezCdoTWmtg6C3ROwdG+EnyS 96ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700836985; x=1701441785; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ySC4dDyweR5VFj2WS61RFNg+TxexzTf09mSnx81sP3E=; b=iVbbEMtiQU1Q8tP6gRBi7/b8nkqOBhn0kSkRn0NP/Yd2XfxH25fsxz2BJDDK70MZgi K64Ma+67geaqKf06gZGDG8ESnPBEbK8QtamoaR6V48XRZMYekqLoMp4RCJGqVgRcLwTr Qb+YQTVbV+oTKFvdBt6PHI+ygpXdsun7el7THcxsKMU8A6c9nLx3b9CZ1VG2ICGP4b47 KqmEnKAoroiCwrctQkiubyvPZwgIGuVx2b/tFJaMU7ZqSrmJz4cEQLoPiUk6GnoV3LWd DENNM5e4noh/Cu9s9w4m3qrJpa4ykaQDdmL0sHzTED7mu67AMXIJblGIFFzNpru1ub7v wBNw== X-Gm-Message-State: AOJu0Yx6uLF3CQUt3+iJBXansPCokKML5JYzzcyIRqONN+DW3YV+MK3L D4elyYy0RJ7XNu5Z5BlcM8p0Hcg/lgs= X-Google-Smtp-Source: AGHT+IFexu6HE/xEW7UWP8dTS1Cz64BU5+eWgDb3FNF1K1f5avK8ycntn2B+uGz2dJwRHIRn1jKrSQ== X-Received: by 2002:a05:600c:41d1:b0:408:4d0e:68b2 with SMTP id t17-20020a05600c41d100b004084d0e68b2mr2344059wmh.36.1700836984545; Fri, 24 Nov 2023 06:43:04 -0800 (PST) Received: from Zuma-000004PC.lan ([2a02:390:9c57:0:c45d:d5a9:301f:4fd6]) by smtp.gmail.com with ESMTPSA id c9-20020adfef49000000b00331698cb263sm4507602wrp.103.2023.11.24.06.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 06:43:04 -0800 (PST) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH 1/2] rust: Delete python2 configparser code path Date: Fri, 24 Nov 2023 14:42:52 +0000 Message-Id: <20231124144253.14955-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 Nov 2023 14:43:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191203 We no longer support python2, remove the python2 fallback code. Signed-off-by: Alex Kiernan --- meta/recipes-devtools/rust/rust_1.70.0.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.70.0.bb b/meta/recipes-devtools/rust/rust_1.70.0.bb index 16d433910f8e..2e34b3de1c45 100644 --- a/meta/recipes-devtools/rust/rust_1.70.0.bb +++ b/meta/recipes-devtools/rust/rust_1.70.0.bb @@ -72,10 +72,7 @@ do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER" python do_configure() { import json - try: - import configparser - except ImportError: - import ConfigParser as configparser + import configparser # toml is rather similar to standard ini like format except it likes values # that look more JSON like. So for our purposes simply escaping all values From patchwork Fri Nov 24 14:42:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 35180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 200FFC61DF4 for ; Fri, 24 Nov 2023 14:43:18 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.138509.1700836987924613272 for ; Fri, 24 Nov 2023 06:43:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UOGaOVPU; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-32fd7fc9f19so1216166f8f.2 for ; Fri, 24 Nov 2023 06:43:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700836986; x=1701441786; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CdUgyD30g8/tXLaN5wjAcHwXVmfwlOTZ/xa1VsxGhuE=; b=UOGaOVPUW59/MNY+19UT91t6S8M7ji7yhHQqlZdo2qDElVHD1irzyq6yybSfvRPQLA wNm4d4XlV+clLFEVz9TSTgQ5o9KyIjFJ+nS2TXOXKRiuJl7gXl5tsB4SVjtl4l8A08hb 0jJCLnYddtFCTdy1WuUVac7wE+8TxlfRNKxmt/eQgF8gp0ZuJOd/Ec5ciICKPIvLzL4K Oc9elOHtcc8eZ8951zO9zSGiIcbesQu+KnyjGiey0Jw0aYOSs4+5A7Ysry9wnFz9F1cV qe6lAT+2if/B5u3Yk3Uy8CzeyreY0zIfQBl18FwTwx4UVmgRQNIA+CoixTYrTa5QymCJ 74Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700836986; x=1701441786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CdUgyD30g8/tXLaN5wjAcHwXVmfwlOTZ/xa1VsxGhuE=; b=BgBpSb9qXF5VVh6BYwkoutWiit6n33CsyEkIockfO9rBa/0VwKX0JxbAdsvoGaEEAS goi+ULKWsBzRfO0+VGha1veYfTyU4YhZC1gy4ELm9Rwglvrn70CNgXK+6kqH56LFzXmp Zz26s+IMr44Ci3W75T9GxcbBKQKIvltmLkJrKh2rfiR5bW90D+3/EBW06uNrd34SDvFK BdmEDxJi21l/74TOWsY3TzOyjIxarP/E2MmwnyKEFytjX7cMspkenIDfnCm6AjVWTZFZ qncKGx18EBijWJCOPbOKrSpzxE2jyWt+Oik4Qkm4LYJ46TqoeC4d4A7bGUAspG9SnWnh isaw== X-Gm-Message-State: AOJu0YxxmCeX07qqgfUF3HcMDWEeg0V2wxGLcitKn6hKYnrhoSksWPx/ jYiULMH7H/fMFzNKlvaCiM3DUh1Cj3w= X-Google-Smtp-Source: AGHT+IFrZpjexazGig4N+ZtG9TLLAhBPyOD5afyx3rOlWHjnKYB9+685Y9IMu4IPrEb2h1xXIyIirw== X-Received: by 2002:adf:fa0a:0:b0:332:c3d2:623c with SMTP id m10-20020adffa0a000000b00332c3d2623cmr2993765wrr.1.1700836985915; Fri, 24 Nov 2023 06:43:05 -0800 (PST) Received: from Zuma-000004PC.lan ([2a02:390:9c57:0:c45d:d5a9:301f:4fd6]) by smtp.gmail.com with ESMTPSA id c9-20020adfef49000000b00331698cb263sm4507602wrp.103.2023.11.24.06.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 06:43:05 -0800 (PST) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH 2/2] rust: Drop TARGET_VENDOR export Date: Fri, 24 Nov 2023 14:42:53 +0000 Message-Id: <20231124144253.14955-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20231124144253.14955-1-alex.kiernan@gmail.com> References: <20231124144253.14955-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 Nov 2023 14:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191204 This was used by crossbeam_atomic.patch, but that patch was removed as part of the 1.69.0 upgrade. Signed-off-by: Alex Kiernan --- meta/recipes-devtools/rust/rust-source.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 4a720e645bf4..7a0790f6b62c 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -12,8 +12,5 @@ SRC_URI[rust.sha256sum] = "bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843b RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" -# Used by crossbeam_atomic.patch -export TARGET_VENDOR - UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" UPSTREAM_CHECK_REGEX = "rustc-(?P\d+(\.\d+)+)-src"