From patchwork Fri Jan 19 15:09:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38065 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 F2642C4725D for ; Fri, 19 Jan 2024 15:09:47 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.24478.1705676979372211716 for ; Fri, 19 Jan 2024 07:09:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=aIHwk5Bq; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JCxRaU007999 for ; Fri, 19 Jan 2024 07:09:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=PPS06212021; bh=tLe/Fh3IldcIiKhkti MhWzvgUMWF5t7FgVBKQCidzDs=; b=aIHwk5Bqc+SlDZg9CAkPRF0aroUcbErWRS rue/QGfk59vT6ylOh95tTCSIMp9OexpJYaKIF7W39hqKslM3C2Vxem7aYF5tb84I KrjtmF9BZiKoOXd3ih0d1pFOooRHUN6ZTiV8MSxpRFRcU5hM0rxO69xr6caxlMgo Uu/lKBJUyR3ArEASiQdtEiazRAvA+QwclDaV6dxI1RdsGED2Gc/F3arMFcW0CfDu LAKpusjuO5vZyccupDTeCgwxDGURj7ijZRGoE8cbAE3lHqV1Li0geT49bKAdpiBb Ccrhj5RT0DqJq1ZLDrsgnENtWX4ay3SXBMnCtABjDxEAQ/FNLgAQ== Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46w0m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 07:09:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GakbWoIegv+Q+v07aFIetUq1Fvk3bXS7gr1qlGU+/Wq69arxtVpEwSlE7X9nmW/T/ZWIOrbjX0QEatCT4vCTkbaXnXIYraOZi7gCzN6c2rYQac/biF5ouJEpzh7CGv9enmrMm7+P12pwLdPfIUmoZirGy6oJE1gahH8zwKdz4HpkyZ0VDplu4MxFKqksFV8IB1ZbmdMQvGY6C9Z0Oe5yQLEL9hHNx3dvqM7Hmbd3AuQTXGyEbEm6JD1OSBZNP8ULgCX6t3E4IGlaRl7JbWoO8/pD8GcUrmExwIHJhXiPnvRVPWOyEYLi4ekOyfaTMOGEvBuy/ITmSfC+0LLF9379Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tLe/Fh3IldcIiKhktiMhWzvgUMWF5t7FgVBKQCidzDs=; b=h2X1pBRz4j85iiS1VOY2i2jQOOOTCZtiRgjyA1dfcB0tzOb0ar1Vc3d8KUraicHxsT4dqgmXQY+Kk8nBY0hTYxD+zde0SpFNaZp69MNVoy6DjaKTfhe/iPKTP79DehD3Ny4NmGTRtha6e+piApsh1iuzH0HSKXpVG9qV9cv1zTVz3ISRGMP6iaNUW4HQuxinVGl3zGpQKlmvMw043u4xLy2Jod2WVm7HV02NnMX+AdmCD0hw4fAcwVDMv7Kv04N4YknfBenC89D7fv0vU0uRo+SyHeXH6KarJ/Ew7M0kp2klCl4GAqoj3PmfqAxk3367Vd93wNvX94Flegu7gkdzaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by PH0PR11MB7616.namprd11.prod.outlook.com (2603:10b6:510:26d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.28; Fri, 19 Jan 2024 15:09:36 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 15:09:35 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH v2 1/5] rust: Fetch cargo from rust-snapshot dir. Date: Fri, 19 Jan 2024 07:09:03 -0800 Message-ID: <20240119150907.3840110-1-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|PH0PR11MB7616:EE_ X-MS-Office365-Filtering-Correlation-Id: d15856b9-1ee5-45e2-43b0-08dc1900a61e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: izjoscZUadoO9TQMbaQQHcz3kB8gjNn5Jm4/Ik/HneuGpGKYKMJ+0DpwJD3Ue++XQXgxLLJrKVFNTaJqPo6ctUVGPoh44ot44Ai7QjSYmmLMH6WawUUgrr1QCvISkohd37Jhthtr/tIkEeu9mE/6nB3ZWxkGuxfOENUcGC8hN3AgJZqZQx1A0pOp1FdssaYsPevVRQu2eW7vYJeKQjGeQ7BoSjgZb765JTqXhM1LCu+QTH6sEnYVMx9Dg6pikjz0B4N++pLYpzRWpLf+8QQ1T+mCQgsgf04wLmkuBxZ0J0FZY0LHqQTceuwHCuiu3zzhMDXTqlmWjgxtFWp7EK+/0xdEyeXUr2TovzZ56UDrfJkFQZrCQbTC9AyK3sC30ofaMotJT0KpUJkQ22FF3bnBBr265jX1ps3g+W2q+3RU1KPKsLapNuy6W0tInFlf7vw3OejnHz0kM6lQHUHPL9DXCpElFbb+SEGI68CmHGtg2uDpGIUhkVMd5FD/UVIjkLoux0h4WYoCV5cxh5siI3qbCwAaa5RqWQ5StldNfl0iQMmBDJB4qhySRY65WQpCdvg3Qu+YtSi1114OJAfHwQsuosfmvJ/05AIkp5hsLnpfxu9DlH9SF8HD61qUdHav+o2q0Xv5nQDs62IBZ0auH1jtig== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(366004)(136003)(396003)(39850400004)(346002)(230922051799003)(230173577357003)(230273577357003)(64100799003)(451199024)(186009)(1800799012)(6506007)(52116002)(83380400001)(38100700002)(107886003)(26005)(6666004)(41300700001)(66476007)(38350700005)(2616005)(6512007)(1076003)(6486002)(66946007)(9686003)(966005)(66556008)(478600001)(6916009)(8936002)(4326008)(8676002)(86362001)(36756003)(316002)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r+PK9BTxiq+ru7E4tig7v2nsnLfAmkLwjgDKPsoCJ72Be8VSTL8q1h5shs99LydtGE8BQ/mgKXd8HK4tUgNCVmf9LSsPfEjD6mr/y1gnzR3vW13CTF0Sf1AtEXAKBK2Msjm4o8T6BBKBPMOjESPpxcf1wk55bp+0mKtIyJ/2IizArdSAqDizr3sks8NeQorKJFvODsbQ3hMO6oOxfbvLmaGyiiz5IxVo2aYjMIy/s2bqLhO2Hpb6VH3S2lI8zWlTHQX02ZuzC4z0FmtTmRyKeW19AtM2dFmGeAyV9Rs27CT+o+YipKUhI8dzE4JM+nm2CThmfyuQqA8vUtq+/V6bEg5t00klcEipjU/uFJ6eiSJHbiXA+GBLpXtq5lvJk9cSU88QJrXIyXMhf3nnCShCShqa+zG9W0Kbu/YAIK+Q20xiQDdY7c0CZePG39ACLLIdKAHwCNDAg23mWVDNXDpdRzTzDMC4vw+KgWYF9+0VADQP/qnQyUj8PZ7UZigaq/3sa+a2owI6zWOyjAqlgNvCn65vjH89a5xQzkPow/nd6f4NFy0Z6XoPIM13EdifcoaTuTxgbYOEGTj07X43Gr76z4PqiUw+YT995XjqAR1gYsZo7khFVRZ9NhhrDEnf0g5+LFMN9xUiatDMBO4RFgIjlOk3rDueg2rXvLktWou+VI1XddfqKAUhmCOXl6jiHu9RQmyNl65nmZxLJTCf0hS8gPjMA2p2qsmkC70FHBOtQ1BK//CtF6fAvXgn7cHZU/XNVdGBAx57BkKfXOn6l6F+xdJZSzQxi/jeiQOEjXm6+7lSvgLVr4GmSNh1J0p+rOUqSGAx/R+iBGZHcPgw0czsCbHzBnny1J4+JszaJnEFmoalXKXU+3RoW1iSeQjKNbUhWEu6UC9KrUPAA+I2PeCdvjJY8TPal3fqcVKfSXWE64DUGwgTTvXuMuR7GI+Hcvg2OMurmqc2V6xcpTC+dj/pgK+InIJm9CRO7G5Ro/ajo43HWDkBHFWqeokI0EqSMqFvskSR47nFPxHqs/KZ+kgw0QFImhdoO3pNlbhRsHrDIB5r8sm9rMQvczMu+pC5nWOJP775IhLJIldivhWbpPJJkII5/G4IEu1qUR6mMYA2HP3eYEs+URY4pVVppBwqQQMedXdm24zljM0EFAeJVHRttT9Tj/nirBZWG67avs2+DbiF69mX/Fu9h2KPwM84mfhDArLvFFbT1i38nABwypzrIkHMDLoIl9kEm5i2gfWA43ma/d3ZKAvL3QfZxiUHp1NZjZ/E5AAY6lYXQKYIKHkPJlX0t0YpM6fhSQsB1yAJZffGGws0vA0u4N0a7PHK9E0ghwog8LJZqV+VSSpLwNp8YdCG+nttkF6nj9KxniAOlzHJghWUhCS6jhA28wMrq2A3ntpI1vhD76y0Cyr8q9w1AsxJOn9euD0o6BiIYNeOyEdXF//KGIxX5//N0ZPvozfEZgktrI2IaIvb7La15H03gh/v5WVrBUFNWhb1UvLhGD6Necy8sRze42AMuEl6Fk4Ol3EeKJxB9iHcRpZwI8H9SWD92PC6OSuYyq26twf8eQ8KSzYpkShZfRBqkkDfgTtc8Sf+s6/n5PWTdvr+LKu1OQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d15856b9-1ee5-45e2-43b0-08dc1900a61e X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 15:09:35.8792 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /fU6E+9qxpq4G2tzfw7+aPvNeDaafVK4xLn+Yl7IBx+ZGeLZXE8xiNkcMKI2AIagxHHRAdttdi0Q14cVvjhFPquBj61w+hfDyq7i00Grsqo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB7616 X-Proofpoint-GUID: AZ0Z5ba1nCogGIcEjyaVp6k1rpoPjqhc X-Proofpoint-ORIG-GUID: AZ0Z5ba1nCogGIcEjyaVp6k1rpoPjqhc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=670 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190083 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, 19 Jan 2024 15:09:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194053 From: Yash Shinde Fixes: Exception: no cargo executable found at `${B}/rustc-1.74.1-src/build/x86_64-unknown-linux-gnu/stage0/bin/cargo` Fix the cargo binary path error on oe-selftest and path set to rust-snapshot dir. Patch sent to upstream- https://github.com/rust-lang/rust/pull/120125 Signed-off-by: Yash Shinde --- .../rust/files/cargo-path.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/cargo-path.patch diff --git a/meta/recipes-devtools/rust/files/cargo-path.patch b/meta/recipes-devtools/rust/files/cargo-path.patch new file mode 100644 index 0000000000..547df353d2 --- /dev/null +++ b/meta/recipes-devtools/rust/files/cargo-path.patch @@ -0,0 +1,37 @@ +Fix the cargo binary path error and ensure that it is fetched +during rustc bootstrap in rust oe-selftest. + +====================================================================== +ERROR: test_cargoflags (bootstrap_test.BuildBootstrap) +---------------------------------------------------------------------- +Traceback (most recent call last): + File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py", line 157, in test_cargoflags + args, _ = self.build_args(env={"CARGOFLAGS": "--timings"}) + File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py", line 154, in build_args + return build.build_bootstrap_cmd(env), env + File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap.py", line 960, in build_bootstrap_cmd + raise Exception("no cargo executable found at `{}`".format( +Exception: no cargo executable found at `/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/build/x86_64-unknown-linux-gnu/stage0/bin/cargo` + +Upstream-Status: Submitted [https://github.com/rust-lang/rust/pull/120125] + +Signed-off-by: Yash Shinde +--- +diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -954,9 +954,11 @@ + if deny_warnings: + env["RUSTFLAGS"] += " -Dwarnings" + +- env["PATH"] = os.path.join(self.bin_root(), "bin") + \ +- os.pathsep + env["PATH"] +- if not os.path.isfile(self.cargo()): ++ cargo_bin_path = os.path.join(self.bin_root(), "bin", "cargo") ++ if not os.path.isfile(cargo_bin_path): ++ cargo_bin_path = os.getenv("RUST_TARGET_PATH") + "rust-snapshot/bin/cargo" ++ env["PATH"] = os.path.dirname(cargo_bin_path) + os.pathsep + env["PATH"] ++ else: + raise Exception("no cargo executable found at `{}`".format( + self.cargo())) + args = [self.cargo(), "build", "--manifest-path", From patchwork Fri Jan 19 15:09:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38066 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 065CFC47DD3 for ; Fri, 19 Jan 2024 15:09:48 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.24486.1705676987599807480 for ; Fri, 19 Jan 2024 07:09:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=h59uWVpi; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JAU8Xa025621 for ; Fri, 19 Jan 2024 07:09:47 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=8QPeR3eyFpU+9miBZ4jFJVxfyTGv8IA0sugOCRwMwSc=; b= h59uWVpiH8BrycI6Pd/adBpEV18CQei8OOo6hrqRUqnMBDUXNPos8H1kHNHDWjeJ fy5Y2ql5naobOwlXOFAWIKaetUBJ7bcYSBZOVbGGJhOimZL5R8t8JCS+rslfUIbQ y4KpYWJNoSj3FoKNZIudRlo2npsnQXlY+s4BJqjgksMQxS3G/flTKw86gKtIvdYd u260u5hSEpRo5a2TspgFmlomcGljE8gxg0CacnXma7J0MfgVr9yiTOJwyRR54cLw JgT6vvnKVEZSFc99gJeYzXpdWojt8esM72ckdIEygQM0WVZxR+00oF7FyhbjtvZs RH/0yt2+YONQhY/sqtOpew== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46w0q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 07:09:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WMjciKORn6roWspWfKwR453Fcf7jxnE28gfVU/BufUwWEjrRxXd4I6+p85CpoDtOoVeA7S3+2aKPuIt6yWFeSyBsIKYZ9USJ4j3ycJx/naZVEs9AMkPL/O9a0lboQJ2IfyXSU4jb3kylbzGQAMo4SAsHgEkYweyvqOMFUvPhsrqwqzQEB7wtnYk4w6ZxMDhD73I4WzVmZzCu22+heHWRqGieJ/EiBRp+eo9/Ag20LInHhB7dSM5M+n88jriPD0J3E2sA0O/YlSRXwsKGlCrANVUC11gmQB6Q48bbsSjGaMyA0rC5hXTigSkiJff/Rjzt/ul+MuDQtQTCPIAmz1rflg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8QPeR3eyFpU+9miBZ4jFJVxfyTGv8IA0sugOCRwMwSc=; b=WHWIGvN7OCpv4jeD4KRitNLJfQn8zxmv2NgBgVGVcu5NrCg6bH5zK42B2d8ku5ilWj5jV7jretNIkQkryfCn1mfh/7e8Gkd7+n+pPgdQwBPve4uE19MxwURzn5wO95y8oeyPYbKjERhyv8OxNX5avOztAKHqOryK1DQxua1S7iuaxbHvq46t/fCmD++Fx2tHwnXF+1+sKFQNPPOMbU3qIe+1VecbXeQW60YMC++fV9UZfVlPwx+1B+8WzX4AqeOUq+2ePwWcPgLtR2nuw0lD5KQxf2kmBmIhlDZntR43/0CCQqmRBQpX2NGyoy78Fznl5gywU30JzkXmLEI7ZDiJUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by DM4PR11MB6405.namprd11.prod.outlook.com (2603:10b6:8:b5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.26; Fri, 19 Jan 2024 15:09:41 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 15:09:41 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH v2 2/5] rust: detect user-specified custom targets in compiletest Date: Fri, 19 Jan 2024 07:09:04 -0800 Message-ID: <20240119150907.3840110-2-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119150907.3840110-1-Yash.Shinde@windriver.com> References: <20240119150907.3840110-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|DM4PR11MB6405:EE_ X-MS-Office365-Filtering-Correlation-Id: c01b11ba-2dac-46e3-e86a-08dc1900a941 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S7OI/oNyKzg24fImjqyfpaT5KUwNSGLtl2zHlgNLmCmcBM/Na0b0DqXfssIL77/IbtxYNJDd3xur0iN+VxXG8AEE5Pu8vKc6eOqryNsThltmpKxB/wqYEpF98aj1sG5VCAv2zo7OdX6kkFZbQA5Rx9gNsZ9BdX+7JEjaA5u+mm7tMcbxV+8nmfrEj+KuCH1RfbCAIA4TP/K5qdj+oNf5P8wEGi8R+/F4g+rZ3NIw5nQiYTLWtwLWzqfGzBHxnbQ+qblQ+5hsvwJf5cYSWODoh1p2AtQCzB0JBINvs14jENEKTuxBZGBR8e3JBZhaa+eeSwffWYpwacY/2zw86KPtyLfK2dB4YEdmM+RKHcUf/B1qO/vt+Wf9D3HZVk49v5LjPEONV9BGPk06OXzAxHq95SJ62J+pgwUQML9RybLu9aQd0JaO2EnHH02/IJSAY8eo8VIvvi5fqcolyi8Br0QP9dhJ8Izt0j2GE7yx1EBTs41U/VTIcRfnuwiBN0gmGs20qRzINFRbtb1jgkHveZgeWk8c7yeFmaGl7QEkOvwRiWFn/sRW6SYLqf6vNQQUUPV8TsMRWdzjVRS0HZWN+u1mZXUOIRsKf6TCeNL/WnqhyMg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(376002)(39850400004)(346002)(136003)(366004)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(26005)(1076003)(107886003)(83380400001)(478600001)(2616005)(38100700002)(41300700001)(8936002)(8676002)(66476007)(6916009)(316002)(5660300002)(2906002)(66946007)(66556008)(4326008)(6666004)(6506007)(9686003)(52116002)(6512007)(6486002)(36756003)(38350700005)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4hmbGV4YAXBXsqEUyxSiWRTbh8Meeb70+uG/uHm4O9TieCQTCtvWhXZJs9grc/9g1d8cMZEfstMe/ZM4xEpFTF/fwN1+7YRDJq3UgzWJCo/QICD9FuDtyaAwQ3ksZwU9S6wCLeoqXP5WY3juSbbAl3N9NgXF+zni3BaYLt26rcoO0HqyxYPkRu/v6B3YY6PTvhJcxeSTAK8pAE++Gvi8mCJ/LLZ3sT9RuTkdGUlgPTnNABa5/5/tKQxrjbXi7MLxb66slhce/7uWH8DHLO7hhzVfZ3Zz2KwcbfUQYT7Yn20MMHlmewCZH+vLPrejzDSt5D/wyrLtuR173tTrlxbAISTYDDAB1c6kEqnKVvFWCsgVvsx7IHKuR40i5iuuXgUXpBAPYVjjDQ9zbmgoqKq5t91Z1+Hb13VIj/nqLi5t61iglLmE5x1h8Nek5nOosev95djBJ9yoSOaSnAn7ltA1YD3pXsUCHJrhGgQR7rBUFhIDzKSMcMwcrvkfPxgBAPcYvIvhWFpY75lgbJAochtvKKJ9eZF/WSugMfGB0k2Hl80SM0Xxoheg1eeO050I+4pRAKE2L3PwpirmokoSinLi/UuKBbAitoBphPlz20CMq0rmmDXFEX5VfwzRKuUXGQPqpunTIkKUfErSiIZ+2t1phUVEE0ZyYfjb4cVrg+ZlDmvtmfj+OKdcFGmjPp/r5tHBMlXVqUWMf/3gpmCKERHD4o8FEhuWWXsjDrYEf8zFPU27pZOUskyLgyC5kGLGz2h+MIvtzxyNxk7m8oLRJLL5rsi0e9Ny+d/dBuJkEvZxzniApgGuZVmpsUfz6jp2EzxRJo/8gDjpEQHQGXDBni2JBx6ZyiVfQdI8lamAzWCYP0melvSXbPSUrMizYfuS1AH+IOyiIsRh9ZvH8fwNvZzpK2rAJ5yLXOljpaNtP+urfOxqmbZhouBKz1sq2eBXlnMOwjBdVevc6ZJYmOy1/X8zSfBtb/AnuvfQWvZe16/2e9pmkkVQIS2UMuLEYek8n0NnyKH+XTKxEKya0mLYCuTB73Y0nrDtFTwjJYjkl/gQKZSI0LLEXG6clWMbnuSJBOeXPmX2LFAmbaInsj9sRq0OjdQqI/AGYOvx2uy5tXsH0vtj2YH3Dpf+ucg+nJ7ovORktFGxlPZdiEOReDSOnHKqaequkWGVN1chF3O6132ZceEUirgjpbPIHIsFQmblCFXWSXTNQ6mwNxZaclueM3wxRFhaXPIXQuZ8qlMAbL1XPzdAcVDcRPIrQed0VFmeg8WGOtOGnEQs4cJ9nsTxWAHySaB8g7Y5QI8e7E3VAf3X9e++xzhQn8xXbA5Xuk2MbATnhh+gL6pl2PT8e5dztZhWdrwhrqX+78f30PlrcvwEKbY5H6C51NWZ2WRUDccW+GwzdxuSMWGmCbjA7xr6rE89RtJMZyRV+/7xneUIDNtJBhgv9EqFojoNZ0AntN5OQuZ2j9QPwbHFDMBEmLdhD3T2/GaYEQjHhe3vnrFuLnVrWU2pZS/yXw6O5Lv3en5DQcwjEGL2thF/3jFrnyZhsSEKa+Ykxkmu3bQBhDjhHEYidRzlByr6ButKx6pV8n3nJeaYGj1MFSFgCtP560dPjbo9VA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c01b11ba-2dac-46e3-e86a-08dc1900a941 X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 15:09:41.1370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EHkmsTDWYaSNeOApzkovyHz2vZgohTyOEnK7OmXwhglccahSbJ97Lp/f3Ih4zFPEuiu/eSVkn8/c1IjiEdnP8LD2iEbGAJJvTlrG4Xkj42s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6405 X-Proofpoint-GUID: xgHELAZpPOiTm4LLe_E5PsIzDkRgPgbf X-Proofpoint-ORIG-GUID: xgHELAZpPOiTm4LLe_E5PsIzDkRgPgbf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190083 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, 19 Jan 2024 15:09:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194054 From: Yash Shinde Fixes: thread 'main' panicked at 'failed to gather the target spec for '-unknown-linux-gnu', synthetic_targets.rs:66:9 Detect and fetch custom target configurations when rustc is bootstrapped in rust oe-selftest. Signed-off-by: Yash Shinde --- .../rust/files/custom-target-cfg.patch | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/custom-target-cfg.patch diff --git a/meta/recipes-devtools/rust/files/custom-target-cfg.patch b/meta/recipes-devtools/rust/files/custom-target-cfg.patch new file mode 100644 index 0000000000..15a7f252cc --- /dev/null +++ b/meta/recipes-devtools/rust/files/custom-target-cfg.patch @@ -0,0 +1,90 @@ +Detect and fetch custom target configurations when rustc is +bootstrapped in rust oe-selftest. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/26c71cbcf1a9bce6ceb962d753c467d098f63cf6] + +Signed-off-by: onur-ozkan +Signed-off-by: Yash Shinde +--- +diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs +index e85f6319936..c45c0b3c652 100644 +--- a/src/tools/compiletest/src/common.rs ++++ b/src/tools/compiletest/src/common.rs +@@ -479,6 +479,7 @@ fn new(config: &Config) -> TargetCfgs { + let mut targets: HashMap = serde_json::from_str(&rustc_output( + config, + &["--print=all-target-specs-json", "-Zunstable-options"], ++ Default::default(), + )) + .unwrap(); + +@@ -491,16 +492,33 @@ fn new(config: &Config) -> TargetCfgs { + let mut all_families = HashSet::new(); + let mut all_pointer_widths = HashSet::new(); + +- // Handle custom target specs, which are not included in `--print=all-target-specs-json`. +- if config.target.ends_with(".json") { +- targets.insert( +- config.target.clone(), +- serde_json::from_str(&rustc_output( +- config, +- &["--print=target-spec-json", "-Zunstable-options", "--target", &config.target], +- )) +- .unwrap(), +- ); ++ // If current target is not included in the `--print=all-target-specs-json` output, ++ // we check whether it is a custom target from the user or a synthetic target from bootstrap. ++ if !targets.contains_key(&config.target) { ++ let mut envs: HashMap = HashMap::new(); ++ ++ if let Ok(t) = std::env::var("RUST_TARGET_PATH") { ++ envs.insert("RUST_TARGET_PATH".into(), t); ++ } ++ ++ // This returns false only when the target is neither a synthetic target ++ // nor a custom target from the user, indicating it is most likely invalid. ++ if config.target.ends_with(".json") || !envs.is_empty() { ++ targets.insert( ++ config.target.clone(), ++ serde_json::from_str(&rustc_output( ++ config, ++ &[ ++ "--print=target-spec-json", ++ "-Zunstable-options", ++ "--target", ++ &config.target, ++ ], ++ envs, ++ )) ++ .unwrap(), ++ ); ++ } + } + + for (target, cfg) in targets.iter() { +@@ -545,7 +563,9 @@ fn get_current_target_config( + // code below extracts them from `--print=cfg`: make sure to only override fields that can + // actually be changed with `-C` flags. + for config in +- rustc_output(config, &["--print=cfg", "--target", &config.target]).trim().lines() ++ rustc_output(config, &["--print=cfg", "--target", &config.target], Default::default()) ++ .trim() ++ .lines() + { + let (name, value) = config + .split_once("=\"") +@@ -624,11 +644,12 @@ pub enum Endian { + Big, + } + +-fn rustc_output(config: &Config, args: &[&str]) -> String { ++fn rustc_output(config: &Config, args: &[&str], envs: HashMap) -> String { + let mut command = Command::new(&config.rustc_path); + add_dylib_path(&mut command, iter::once(&config.compile_lib_path)); + command.args(&config.target_rustcflags).args(args); + command.env("RUSTC_BOOTSTRAP", "1"); ++ command.envs(envs); + + let output = match command.output() { + Ok(output) => output, + From patchwork Fri Jan 19 15:09:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38067 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 DA76EC4725D for ; Fri, 19 Jan 2024 15:09:57 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.24503.1705676988554702713 for ; Fri, 19 Jan 2024 07:09:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=fZrF9ZYY; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JAU8Xb025621 for ; Fri, 19 Jan 2024 07:09:48 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=3/tKLyUcn8JYi4nU6KRjMEGi7TGeggur/PfByqa357w=; b= fZrF9ZYYc+Unzg8VPr8zUSEm+sdttVhb/ywk4OjTSkTKytt3tcYRotLqCk3r/oX+ TQbIjug45wKOBYIJuDmSjDGbswg8q/TDyAAghOd35gntIBZdIzjEVBlob1awYSwj ecx4VNBRLa6kQVVut40qo1PFxPFAO9nJ44GbWHiiWH9B6sbyubGBlJT1tc8lJMts KqYudm9Lczx2Y5N1T5ocNrhPWDt1myQ/BV1NGzih1r1u7oR1wqw9SKn8viwt6r8B WRbDZ4Sv7kV7wOU9emr1QA0q/ciV0zOr3pn7k9YwgeRpEWeoQ8Qdo39yleN8pOh5 YsHmZruQIi3vPT0hFhMsPg== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46w0q-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 07:09:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iRfvGHhxcjkvPN8c8fzA5b5f36cCcPFsYBJWUjQBLN4M1wTBJtuP/9jifAntMXjfc65E+RwcZs/PV5GDLFpZgESz5ATYASr4+1QSDsMcmBgEoqSXjdLRtl/VOLnHLI/+VzvQxuKaKrpd4NyYaDr9J2LsWtO/iXEDNHvimzv461907/ojnhxVsg743/OtcG4QQAGZQDG7jQt2jRbaOY15dNnf3K81EhOzSigaCwWdwaj9YXB4fp50TwhuqGxtBBw2ysgMT1YKTN6lbOGAZE/fTnYvbSxSQLfHGPTxt107aO1/loAR0OtYnyDZXNO8/S/CU7ADd5khXr9lw0UDu5z6Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3/tKLyUcn8JYi4nU6KRjMEGi7TGeggur/PfByqa357w=; b=nyqF8ucHT85QmkRsHQf3DkwGUQTI6dcNPV4eBBTHhDDHZgnCCNEUXbqrBgt4nCEMGL689Z8D2UPOqw6NXaEQE/DeAvxjrpiEfdH46dfp/vZIwNvltENQYnJp6cd84lk/QwoBZzByrkdWwhreTwAmizZlqfNFw7z+9sdCRL5ypfI+EPJkPKG3S6xjQDF3r4MGsORxBjmDr/Bc5yinS8lKheJUOamGM5/E1z5fnc2MhF5Y1iM2VaIrgS45x8fU4HHFf6j924Uce5I5eViXzpBYn0Q/CPl7ce4U102nlfe1kqgO8O3TigGsLmcPO5l2B4dh9zLI194Bk/z48ZVSugvyYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by DM4PR11MB6405.namprd11.prod.outlook.com (2603:10b6:8:b5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.26; Fri, 19 Jan 2024 15:09:44 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 15:09:43 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH v2 3/5] rust: Enable RUSTC_BOOTSTRAP to use nightly features during rust oe-selftest. Date: Fri, 19 Jan 2024 07:09:05 -0800 Message-ID: <20240119150907.3840110-3-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119150907.3840110-1-Yash.Shinde@windriver.com> References: <20240119150907.3840110-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|DM4PR11MB6405:EE_ X-MS-Office365-Filtering-Correlation-Id: ba315bb1-4d75-466f-c896-08dc1900aa6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iulAjWxI5BHJBvMapbjIOZsmxtfQsdbZHsF0IJMnA7bRNiaFyiAPQeRlzyQCpJO5l+Bik5szBFPVPeWOYJpAgS/2uQDnsSJ3jTFhb+ldEdmJlmoObK2d5vih+/ahmqwD0PZ6+BRbmLhW8erTNY5mmnYYeXB/1f+7rMm29bdtOtkOixuKia/VlcAeyzb+d7EMNEpiQp3hjLjeuSlhLUSOKUlKJUmrcGpPKI1Dq/pYRdDB+aP2JcS+iAePgas1MDDJM9j8o+LaPPdjiFtflImQK0LbvfYFM4BJEdr9mvsUGIJdCTZMFiYxmWbLtywKenrs5CspD47Wst2N7VRujB2G3rPcU51c6dPT8QLCdxD+PsEFmJGCHMkZZ/+ygfFQBTtaWwTAmzWENd/GIk1fcTvR8tSVCHfbbQpq35Yxi3H96uTQoiaOjZAeBRdOcaABNqz3QG09Xc+XIKYRLSLN2vJR00Xic/crdl5n1cXA64/lT/qpQbYTO8Il5p+QXmf93inr28sOAY5XyVsZnEc//MsQR4WaPGhZOnd/s/eSrk/dOrmCvo+bpGXB7tzsLHkk9X07m8YI3kNDBjGwD1m6ztVPPdRhPXtP/z62Gam4eNLjNhk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(376002)(39850400004)(346002)(136003)(366004)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(26005)(1076003)(107886003)(478600001)(2616005)(38100700002)(41300700001)(8936002)(8676002)(66476007)(6916009)(316002)(5660300002)(2906002)(66946007)(66556008)(4326008)(6666004)(6506007)(9686003)(52116002)(6512007)(6486002)(36756003)(38350700005)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cRH8MbSqlgkfB3HoubPBuif/058KGKRgeOemle/4JlW6wv1XZd01cn+c2RT3YviB4tuZOoKYPL9ovXk11KpnykBX0ATIRuqoPaX/Zc+Jzc6365Z16yZitPMxhcdmDExKJNDb2FE0A+KklmzZRf8kXdhpTgGNXJbgIj5DnrpMbyUTjQz4PZVMN/kjlNegGkht0HtzHKdkRo8zpzMP9RUglVq+DW6FqBTIMxCA0/D+sCLh5LHwHtvw8Q5VKaDLJ9ZIEPErd0AjaA0f0NSqg3sTuAUJ2AllgNbfm78VqfifK/euCm3l4UtUbX6FwlJQyCtk6vsg7m6an9N+YCtZvGfWCFWv6lkxB+pS3AwRGw+ysRsZ/eu+E9gTYhvjgt6nXpRmb1AlkFnzg2xRGE+2KiqrXKupim0E04odmG01GNBZbDOi+Z6wydat8D/Y4HcwLompcN9ATx7HK+h+G/kDhyffqrUzX2XhG4clzbv7qyUF1tV0xDFKWcWE6BX6Q3eW1xay3gpb2Oi3CtlgDHOgWG5WQh/rqdh8pEc+J6BBq61i96XZQ7Y/aZXanvTZ02TK9Y9GrDM3jRZTSSMga9bu84crx9qk6aUlbMEA/LqefbA+IzHCCC3/bJx9M4oH4Ljj3f2um8MoA4UeWa09fF1zGvZ9kBMNnreqE1/sY88Q5b/QNurgkY9OsHutxOTfHVOqYbk4DTddRaImYBdphO5kiK0Jsc/RUJH7D7VvKi6m1iJTSeVwln/HuaJxqLAWP24OPYsYZMxxQeyVinhGQH2EkkBUdD0WbM0+/CnRORlPdRR+cA/sUmA6e0p/RfPxNwTJIqWM0ZcqazebkscNi94mOadb0sRovgyse0ltaRE9n2XtReGpllILtgatpIlB8RI+BBhggBOi1/sMhw/zQcODLNfkTu2yuE4aaLPXsba/9/O+GIPzi6A/bN4QuurS2MFZEtRSmW2JlHJRh3OP9MZLEvBM6DhI/xitXpPzzs8M96lrctMRpQlyEOK/y2zqUARJJuweFCRHhDpgoE2WmNFO8nDbWqyPfpzRqtM8o0/Yh1D/gzjnnAMM6LugWS0EBaFKE5zTcMyH9unh/OE+kQGUO0V6UvhW+gFlTlD0c1rYL/GbuHPEr/YnN4qZqwfSPrF/0/2QhZjAI2M6Ceho5v9tc+XX3bCmkI2dhY2tTXUInHZvT/FNOOB6JedB0fARskATlRq/wu7ETAFNJouygkpO52ODNKgj6+X4klT5re+oHrGRgPErT9V64MAlXg4xZPRhUayTnT5NpDhikw2hu3+2+IiEFKg4ouGhluqvzH3PwxgBZYAhFFqQGJ6WRsCsT6orNDPimJysj0LaM+9axwhyTIBj4aJ5ynJxrMXinDGdw6ZThg/vR17nc1HvBXOdJa6xIdQSYD9Wp9eYYbMp9n1Zi8iVbBex4gaoLwnv/8phUA9vLwAYwBzWBL0N+xTm6TkiFsxjjGxD9xbFdIGO7u012NRQL6Kh49z5SM0ci7tfOfNV4IY6IsHUC7O+nht3IENl4PzaKiKHaXoZ6RU8F7NgQBeDF6bE4MHDsessSdwvCngBzYapnGddaQAUnr+2SGjfIOLdLg0DbIane06qHUD74JBODQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba315bb1-4d75-466f-c896-08dc1900aa6e X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 15:09:43.1493 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w9FsB+nqLiWp6gUtqtI8KeWkE255NkEnMLP9WKdFiMSVvboSQWjSRaMpXWXRLlx7IUu5eTJgjHTdl+JLjr56TWDRPdNV/Df0dvMXwIOP6Fk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6405 X-Proofpoint-GUID: teUvleA5V-iNKvyoAq2ijkRWOs3C7jae X-Proofpoint-ORIG-GUID: teUvleA5V-iNKvyoAq2ijkRWOs3C7jae X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190083 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, 19 Jan 2024 15:09:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194055 From: Yash Shinde Fixes: error: the option `Z` is only accepted on the nightly compiler When rust.channel is set to either beta or stable, we can't use nightly features on bootstrap without RUSTC_BOOTSTRAP. Set RUSTC_BOOTSTRAP=1 to use nightly features on stable or beta. Signed-off-by: Yash Shinde --- .../rust/files/rustc-bootstrap.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/rustc-bootstrap.patch diff --git a/meta/recipes-devtools/rust/files/rustc-bootstrap.patch b/meta/recipes-devtools/rust/files/rustc-bootstrap.patch new file mode 100644 index 0000000000..406fc610bb --- /dev/null +++ b/meta/recipes-devtools/rust/files/rustc-bootstrap.patch @@ -0,0 +1,21 @@ +When rust.channel is set to either beta or stable, we can't use +nightly features on bootstrap without RUSTC_BOOTSTRAP. Set RUSTC_BOOTSTRAP=1 +to use nightly features on stable or beta. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/8aa7dd06f6e50621dc10f9f9490681be8a45876f] + +Signed-off-by: onur-ozkan +Signed-off-by: Yash Shinde +--- +diff --git a/src/bootstrap/synthetic_targets.rs b/ src/bootstrap/synthetic_targets.rs +index d2c65b740da..45baf56f46b 100644 +--- a/src/bootstrap/synthetic_targets.rs ++++ b/src/bootstrap/synthetic_targets.rs +@@ -59,6 +59,7 @@ fn create_synthetic_target( + let mut cmd = Command::new(builder.rustc(compiler)); + cmd.arg("--target").arg(base.rustc_target_arg()); + cmd.args(["-Zunstable-options", "--print", "target-spec-json"]); ++ cmd.env("RUSTC_BOOTSTRAP", "1"); + cmd.stdout(Stdio::piped()); + + let output = cmd.spawn().unwrap().wait_with_output().unwrap(); From patchwork Fri Jan 19 15:09:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38069 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 E6280C47DD3 for ; Fri, 19 Jan 2024 15:09:57 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.24504.1705676989053163966 for ; Fri, 19 Jan 2024 07:09:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=eFmoUbFP; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JAU8Xc025621 for ; Fri, 19 Jan 2024 07:09:48 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=bLFUQGg0HZ4ptAyzqEcWSrR2yXDsaUkUtlPQ+KhZ95U=; b= eFmoUbFPgz0iqip+lt77NeCfOysIABoTjIGcDx8xfkyD4QLvzUkRta2skK23WU+5 wxJPdb7aMtonXz1DFbi5U7KLW+/kk9N/Pn3Ss335P3jc5R3VT1hOBbQN+r98IFmT F0FvxC95O0bLonwgydwFHp8QbjuTYuY+dy8DaihccND6H+0cW1iaXvlfxlTfXYTU PpF1soCPUDFEeByxUwhib+KO38iAhs0MPMEV/X18cVS3Mm0OlxtaNoO1jxw6ipxg fOStv2PDxzF5UWu6oBZAbzpEz1/Tvh0cYfElychYMfDtxm0l+Us4T09I9Tu6YEh8 Mo0MMRCZkiWDXPytxZ0C3Q== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46w0q-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 07:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E3VCGBWUl28NjuPE8qdjuUOKphyGeOxLPg2ASXNDQ/gsFSHUfuZ6eO0jeQZBLPpUdOIlRg/DuzCE6ByS0W48wB0ifqW6IkQ49E2/Ilv5IlETJSNPkz8+ykXNkX8IQIAgErLO/JLN4WQsnFgI2UA6AP0zb9aiwzF9F+UOEXp0TwYnNRb8LAtOwf6cX7WOxddw+U1R048vIpNSGuNVIl97FQhvfQ+QZPmM9Rm34EqWbxn3R+HLxUqAo55jqDnlJPwHdqZ83HBwC0FSe2c/YjzxWy4nHtRUcihp7UrfVuvoXt8QHdak9kdFEZo5BEq+TtHBg2yk+dWeGq0G+SBir/krEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bLFUQGg0HZ4ptAyzqEcWSrR2yXDsaUkUtlPQ+KhZ95U=; b=MDC25EKMZRNJ+42NXpx3h9yfde9aBVjdMttm2j7cBcIHCjT3Yua6CPdPB3h/e7iuAooNaspT1u6u3b3gty1KN02wkrHIzTL8NICWE9aWhQkwiuhd8QL4crupsHfyGxjPMOuOrvh5saR8X8aXefMPd/w2CJvJCdmGn40NKU8JRIIKX5w5MSt+Y3S+qsus/2KWRcUZ1M8AO45HTwViBv8NzrVTWURx3eh+Uz6sYZH5CqNmKHCJtsPIlIAlC24IrN/FbhpNDaXV8TnRPdaCQofXGPys4XZCNGU3xdDyVbKwdJUYUFITyfhRhitV4Fj8dcpaycfG+8r3MmwZ6BzDEngfLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by DM4PR11MB6405.namprd11.prod.outlook.com (2603:10b6:8:b5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.26; Fri, 19 Jan 2024 15:09:45 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 15:09:45 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH v2 4/5] rust: Fix assertion failure error on oe-selftest Date: Fri, 19 Jan 2024 07:09:06 -0800 Message-ID: <20240119150907.3840110-4-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119150907.3840110-1-Yash.Shinde@windriver.com> References: <20240119150907.3840110-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|DM4PR11MB6405:EE_ X-MS-Office365-Filtering-Correlation-Id: e9931df9-7cfe-4382-d3e1-08dc1900ab58 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P6swJks+lZ4vF/z+1gDxkoxrmDoalI2q9ilkiwBsSg2Bfft/Y8ky5XVaavf+R8fJzeZUiGyO55/n+AWMutjBCjAiVkru6NA/scm0kOiOMsuytspSor6xeQC6ibtRb7tH6Ea/PuydsO3C4lJyyBxsiNNxhvrEORQtsdTgEJPe8Cw8P4MMWFqlFag2J+ERr8tKvvhIT1KMxlAImT6hMD6jNlvC7nqa7QTY5gPVSxZFgtKgzSo9AGk9v7RBsryDDP8ojJ3LHJyrh0ZJrp4fcV4XEUXMtzSFKbg4s90lWXtSz1RrKCKRVHHuGre6F50fgGQv/ZkQr7FDDiU3ex6qUWE+8dpLXx1aTleufQI3q0nUvvvMUItIwQPS5tReMaBiQT94xiN3DzNP5srJE9L/Gp5Bxh1rODVj+CSfeFd7E+bBc5GLQvwkWKaXWXnegmC4KbgnYRLTmdD8l6aivRSJzjgOZtpBanZoCmoGCl5wTnOu6fEvAmRnVftOk805u5o/wcCA2RzgDb+0hG5HDVFUTbgPlNH39FLYKU5v+mO1EKwJZqgjWYd3T+F1NVoRilus326zBb/1DEdOgg65QmBO09ntIu8LaJaiWxZ6s1dTUbUDoUk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(376002)(39850400004)(346002)(136003)(366004)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(26005)(1076003)(107886003)(478600001)(2616005)(38100700002)(41300700001)(8936002)(8676002)(66476007)(6916009)(316002)(5660300002)(2906002)(66946007)(66556008)(4326008)(6666004)(6506007)(9686003)(52116002)(6512007)(6486002)(36756003)(38350700005)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W6QAWVZTf+fMBzaaTTbV00OqtmNIizNO2PifQIwxDxZRSGarePiDrCWg4iZwDNkje5P279SA5nJEl7u9OpvIZAKqIbk9D0EXYDHQnY5IKmk3bY6cqm1dQsVgIeelBCcEA2IiEeTq51HAuB16FLPkJHlc2Npydq6diIpi1+w5eDVkpC/AUAeei9ByiBEP3gtc1I+TxXpXeaIeFVle0UqXz/4/81Iz1PKKbnmPELh2BiqvxmrrZ3nFKYRnqy8Q6Voi4dOvmyTp/NW7BRMo5xmK/drOuyg2/G5LTev8PHYv1j7tDy8Ppk78MwwEa6YJQowiVggoH7Q3n0+R0unZp1lQ7srlYlKlMWfmT1+BUbygWMf2+dakCS9BaY/xZyfvFHtL4KFfpyIOuMLnKJBWlsblZMwtuU5UBnbgbyGF5c+gmaQ1YwFBgEQWB6a8HIs6alPAd/V/CJj8Cu1ECoFeSXfLTe4m1bHNPXODomz9mlyHHh/++QzMZeAmOlPeMDpxcC2cxQK0NT2XK24AmpRMBo0QgJ92UdKuOZgHRXCr/67h8KoeecldlHB3sQ0L+aDrWiPZ6IcF67OVTCeZ/303FrsEcmRg8SRt1asTIg3wKcCKwD494HxsY7C9tlcgpRBjL4RzzwU1a6fNF5915sdpoMuIjTbYPvtaBuMB+m1SjIBuauyNjmd+FPnH0k98gdTZNug7EB+UPji2m4kjq575OITnOTmCseKI2OGe3GPiTWvkRdjGK3wMbI6M8mIK5RZDnJGJfJeUwRaw32e2+DmWVgyT2+wxuXIax45FberdonBm1CKBhpT3ImVXJa4p527tZTCQas5UNj/TcsAGltOY79edPCo5dqDG3fWLFvKtY98xUPFQQ9wzJxFd7zkEiHcyGvXsoEkyI5Fbo0Jzj143WiqkUxaj6aw8tPvfm3NjEeyCjAwVynbG18jArCTfwYw5vD2tDpRTpoQpwFUY9mDIOYpraGdjsHTlfn3GEg9QvsAjY4GYaPwWixCr0QJjLy7QOpymOceofFFeEwcrS8ucHh7dpvPkprIwyV4CWVuiPcycQnGbwUVE3Z4eMV0PdOl9I0iK6d8zs/WMZbrtTlnP29q1dggKP8apaz4gkK1w/kw5gF1RnVQytOnsb8a5Sy7ajtSm7a4ajQZyTfwrdN1n5USjc/M4uww/7TbZaCweTVRrqAvO8mAlBYR6bUF1FkYsxwkqO4EFleEWId3yVlAtLpr7xml9bNKVFZJ0JUn9GF2/v+42+ad2QAz3ai3jUPw5hQ5BS9OXoyhTAO/ePMnG5l0DjOiwxRvoyz4/21ggiyBNosnERNYalYUvLQM97mOarqE4U2DEu2+hkrAP7fZOO+coDlMIDfsfCt9B+0UYPvLLRzIJvrrZGp6aHQcTqiVFrQWdf4Rsr1CsY02le8FEPsJ0o0+387JEpKIXxt91akCgFoDM0c7UBgWSDPGlpmrfaTFVVbrUMIZeaAxyBIfKSZa7UakfY2w84QmBDFjs7wPESJh/PeOh36yVvmnAChyGyhJ2LZ7UM/HGOpjOd5jdDA2dEVIvm/NQfioRwS/pp8T3TFBXU8aMKmkiLEeaRm7P0jmOiaBJ8PtNVSC+qzTPFIE6dw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9931df9-7cfe-4382-d3e1-08dc1900ab58 X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 15:09:44.6265 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QCwOt7Lxczgea+PAYoOcl1M5Pj3WHRiTcTeH4p7lhd2k+xpOyTEZIzY2QdsSMv0C5f7ASTt+MqYvja6ETbZnXYh4hEE11P8Vz7+sESGJG3s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6405 X-Proofpoint-GUID: Du2GnvXKBdV-E12PqBbIulvdi4Ue5vaN X-Proofpoint-ORIG-GUID: Du2GnvXKBdV-E12PqBbIulvdi4Ue5vaN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=820 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190083 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, 19 Jan 2024 15:09:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194056 From: Yash Shinde Fixes: thread 'main' panicked at 'assertion failed: `(left == right)` left: `x86_64-unknown-linux-gnu`, right: `x86_64-poky-linux-gnu`: Cannot obtain compiler for non-native build triple at stage 0', compile.rs:1474:13 Add correct target value for cross-compiled targets on stage1 during rust oe-selfest. Signed-off-by: Yash Shinde --- .../rust/files/target-build-value.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/target-build-value.patch diff --git a/meta/recipes-devtools/rust/files/target-build-value.patch b/meta/recipes-devtools/rust/files/target-build-value.patch new file mode 100644 index 0000000000..23e8c76801 --- /dev/null +++ b/meta/recipes-devtools/rust/files/target-build-value.patch @@ -0,0 +1,26 @@ +Add correct build value for cross-compiled targets on stage1 when +bootstapping rustc. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/b888e2f82b9dbe81875f50d13adbc0271a9401ff] + +Signed-off-by: onur-ozkan +Signed-off-by: Yash Shinde +--- +diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs +--- a/src/bootstrap/test.rs ++++ b/src/bootstrap/test.rs +@@ -1489,8 +1489,12 @@ + // NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the + // running compiler in stage 2 when plugins run. + let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 { +- compiler = builder.compiler(compiler.stage - 1, target); +- format!("stage{}-{}", compiler.stage + 1, target) ++ // At stage 0 (stage - 1) we are using the beta compiler. Using `self.target` can lead finding ++ // an incorrect compiler path on cross-targets, as the stage 0 beta compiler is always equal ++ // to `build.build` in the configuration. ++ let build = builder.build.build; ++ compiler = builder.compiler(compiler.stage - 1, build); ++ format!("stage{}-{}", compiler.stage + 1, build) + } else { + format!("stage{}-{}", compiler.stage, target) + }; From patchwork Fri Jan 19 15:09:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38068 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 D911CC47DAF for ; Fri, 19 Jan 2024 15:09:57 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.24490.1705676992354213790 for ; Fri, 19 Jan 2024 07:09:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=IGj2N1S8; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JB6mrp004691 for ; Fri, 19 Jan 2024 07:09:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=LAPD3HRSW0UiBDXV+6NgLAdJ95RX3ckqzIN/raCfbsM=; b= IGj2N1S8Ma6Fo700HaUa6mVadPHwjzL8tbSgGRq9JcZAWUvUxugykN2Ijh3v3Kzj 0Oo2FLlig26McQCum9ptVGYIh6RQdZBkhQ5IQM78eXsj0wmxh5cyDjnBnJR77eZw BmHKcdaFGtdLI9z0TcS5tgYu4oq3cMP0X828QWjN356bbfqmMi3kLEI25YnoDiO0 0H7Gy2J4zBpUQmJfDxz9C2FbWoJvGwFiPcdGnBC1U8ThFkfzk+XL9i2c2hhaoBfC mgJGyoYiCMRZ5iIqRc34C0/aDPR+64rOTZ4oLmXERf9TBPOemxRf5cEEBEENVN/m NzVioEOvy+WqcL51ECblvA== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46w0t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 07:09:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LCnIObUJofkohHA7iRUwUTZ7sezeYu4tlZhZSfCHH6U+zNmUSyTSA1G3wRmPKfZuLud92XcYVTfDJSBJV/haw61DBi0w+ddVFPYaBSC9SHs9pnt1qE/gqGHSm92JAEDgyVjvMdjRwaF9jOuaXPMvV/wG3eukO7pMgXKBZFsIKRcpmsGB8MF6oznTSPcrv4xyq5plJ6jsW5vY2mWKsQkpzI4PqIuAzQ6J4NFy0eo+BlHKT8TU/CSBJikrXIzEH4STKwQ/0H/lSQo2utliBj8eiVkqSWjD5IzJWD+9IHeCtqX1L8KOSIrJtwH2dRuOdKvcd/x+OYTsehiDPljNBjjDpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LAPD3HRSW0UiBDXV+6NgLAdJ95RX3ckqzIN/raCfbsM=; b=h+Nl9xyNmMyygVNHjMuplL1tPFEfn2HnKOeHhWsRUPZ2HGRcnT16Kj9pxYdOfNmcxb6I7/pLgNvo5op9Is0bl0CuQLGrYzmGL0yL0m9x5NVdtjvmCliA9Zu5NvspTA8aqJMmC93asNBV7K5svcKbn1qsdp5qA1LiUt/K69+348/nxFdw2D0m3Yn+i2wdwEZzw2ULBjHII/VXZ0if9yNgV5gnReandwfJ1CVFkejTWB8bpvqo+mvVTQl8hjN/hXrJMs6vHKlbcnvhSn+3PKDsT0WrY5uplE8L5Ai8T5athZi+mG4LEt0rdpK1DzFhIx+FZbfBQh4Juc9P1Jp5+Z0ppw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by DM4PR11MB6405.namprd11.prod.outlook.com (2603:10b6:8:b5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.26; Fri, 19 Jan 2024 15:09:49 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 15:09:49 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH v2 5/5] rust: Enable rust oe-selftest. Date: Fri, 19 Jan 2024 07:09:07 -0800 Message-ID: <20240119150907.3840110-5-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119150907.3840110-1-Yash.Shinde@windriver.com> References: <20240119150907.3840110-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|DM4PR11MB6405:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f9dd287-cd28-493b-f569-08dc1900adef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eeI//9dOISDuHt5ASMdWo1C8BADcuzH6c+MeF+yACXueM7CtGcyROAu1oTY/nUIJPs+Acl16pW6J7MNlxIE2E+POIGHcPZczDx85j751AzWx6tanFla789q8e6NsxCn0jpWp9kQqmNd9mAZgwsiEb7nPZH0m4umzl7kx6RA18SberqSBZRnJlPDnx3MQbe9hdlB7AVLQ5f6g6lNuQa9JIh/wBbqA9cvhoKm53OrkK+G44BZw2sd88V0TneXpaXlPgoy8bIdAfil+VL3SCjF/EdF5vyR4H07Z290T0JmZ3RGtSq9E7c+tTKIqKFwCx3b3TK6WMJALYzlCwMZjrsZEw2KsPA0iD2I3NC/a+UinszPOKphbm2vDBfnDKzsttRI/C4r8ze0rS6dfcdMKIBxsZsItIpSAHiqCw4+uCAgVGUvVgSVRYX9x4HCR61tbhlBxT9JE9k+O8Gzt7EBlBaBJpZYabTf+UkEwUsBRDrJHX3enV8h/9Gx5+J42Ujl6sgQeeGrySi/eleegWC7lePjhE5iK1id5V4TvHTM2yHg9hQvShDOIqB0XlZTeIdLfshTGnuMiPm+bNKMV0uBjEUOAoqMEfYp2lj/gY3OkJP43lbawntmU6+wgV5N1ZvF3qS1tbM4krzKbVca81LPmpkbRog== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(376002)(39850400004)(346002)(136003)(366004)(230273577357003)(230922051799003)(230173577357003)(1800799012)(451199024)(64100799003)(186009)(26005)(1076003)(107886003)(83380400001)(478600001)(2616005)(38100700002)(41300700001)(8936002)(8676002)(66476007)(6916009)(316002)(5660300002)(30864003)(2906002)(66946007)(66556008)(4326008)(6666004)(6506007)(9686003)(52116002)(6512007)(6486002)(36756003)(38350700005)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wwf8ysFp+vMs++OQi+9+pu7sFtRdkz4lBsXaTDafv3lP1sciITejYty2RsnCo5cPQAU0S/rvOqpX4p9hUzHly1sXiMZS4Y+CjqmlXLEw509WjgW73/64sVyEgWk7hhJS40zdcns7uZFzI+PJ3IWKBorlLIKcQrR+OW6bxE3guVukM2s3jrFqg33SUJf7vaSCvy3VvhE+X1Cidz+KTAR3SEC3qFi1V1x3ER0S1m+pN383fcnvf0igVvuSmTsIVCAtI9BlrR6V4RCsrlCYd1aa8ZyxwPY7q80Q3ktNEHy1WGC2fKMmkfvigNlb+9a5eqFbVaT/pkytCem7RWkgURwAw38YU7QyeJvWwbOAEZgnhVTPFo58Ho8Jf/IOt0YomMieRqTogAlMuXiTipcTbr40AOJ51Evl+9qmiXvS1yktMKlrNBrm11VpeaNlDPDhJYyChqQZuNNhVgbgLCeAhq7fLRujkEb06wJs+9vhIYpjpqtCZrTxkR3ZGFhUOOiXx5QIogqfCl0VKV7AZrdguePZONVN67ZbIOiYNyeah65D/4wfy38e062gskqoEXUdVoMOdWW5AXOkwnqNmD3ZGVVnhR0BGeWzaKnzyvNERqDv/Kz/xg28XZ/uF3hmWkyXaFCT8eXsWk7aK3zHBFzpD+nALk8UiwOtd0Jnm7Vkr2kXGsrxTWrfA/ZBpPFYnRM9i1l9HvhXIilW/hlsKxzpHWXxgcADLn1bbZpVacGOkfZlyGKAiHULihjcjaQQZKuGngoErdUFMUrLHVYYSTISKWo6eW6g3BNYAbsVabTmv0TimwTyKIG1Ce9eKC/Z+zQdZPZKJsJ8r4PGgNRxzJRFcZZOrYz/xM0VAAKr9kFPVPqMl8W5Cibr/iQ1osshkzIhO1okCMv4gF2AeZR7t3akPaMLSz4yWmPCoHD2n0dY1s8EpBHWxkBmHzjDWusDTAqY9dn90MPgTTGHPZ2huI+JD0ZAkKYm3AKjhShKrm13rkdMh8AbA2msjxr7nfMiYLuZd8WEhV5QLmYxHleV1qDlhrm3J80gkk/zXXadmp6PEOsva9tbPEa5Z03Ptau0wsytpKyfad1jZsY7wwKsTIWlNI4Jj9Hh6nQ27zYVVKH24dnJBILiv+Kd4HKpPI0bsn3Fn+Zcx9P379AqZJHvcLrkBVh5JWGeKyWAhqJawcgv0b89Hkp9f1WKdn8vl3TAXAI3f/rXNazx4vRDsKIHv98aisl7fBHEcpLAGUejPSD6pFJA2J2zmm34l+EVPKzNReKtXOt45ef6PriZxD0WlZoN7trhN4wtHb+cQQjU8BxEtQNYoYjqgRZsFEmZNpIOmDqgYWRhmfUh1MO5CpY7siwiF3ZQHUf60Om0BL/CEYg5tn2HxJb9rHmvDeAenXGxguIxqZ2m2+p/rOPSSY9+pN/gIMa84nOMkVwyq5sYSMkSITEJxbibYXulGGnNoV+L03T49DxV3mSQ8dSafOjlcyxXJBSzLZc1NRDFHuHxygpcS+Xdgm5vSSLPErby2fBy42Kdalu52/Rsbb7xAhrpEOh+K9AHWRKxI/T9gK52CM9uXC23IHg8HlfoIuQ+/cLYbERFLk6d8eHeNKZ2IWCXPMHQkUdp4Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f9dd287-cd28-493b-f569-08dc1900adef X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 15:09:49.0140 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wNR2g0s46hjLUF6PsfuBNC7Kc5QYMhs5jI8aHirhRh/GjrVoEieNM54wTdGsP4V6ll5z6s8y2njFHKNGgGpvBVT3EhT9sPviscXAoQlyFkQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6405 X-Proofpoint-GUID: T5vBap3GSmGDyy76m7V7ZsOdOyAQDuHa X-Proofpoint-ORIG-GUID: T5vBap3GSmGDyy76m7V7ZsOdOyAQDuHa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190083 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, 19 Jan 2024 15:09:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194057 From: Yash Shinde Tests which are failing from below modules are added to exclude list tests/run-make tests/rustdoc tests/mir-opt tests/ui-fulldeps * Redundent test cases whose parent dir is also present in exclud list are removed. * Newly addded tests are sorted and updated. * Overall exclude tests count in exclude list is now reduced to 114. * The testing is done on arm32, arm64, mips64, x86 and x86_64 targets. Signed-off-by: Yash Shinde --- meta/lib/oeqa/selftest/cases/rust.py | 165 +++++---------------- meta/recipes-devtools/rust/rust-source.inc | 4 + 2 files changed, 43 insertions(+), 126 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/rust.py b/meta/lib/oeqa/selftest/cases/rust.py index 6dbc517006..7d0efb1b01 100644 --- a/meta/lib/oeqa/selftest/cases/rust.py +++ b/meta/lib/oeqa/selftest/cases/rust.py @@ -40,7 +40,7 @@ def parse_results(filename): class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): def test_rust(self, *args, **kwargs): # Disable Rust Oe-selftest - self.skipTest("The Rust Oe-selftest is disabled.") + #self.skipTest("The Rust Oe-selftest is disabled.") # build remote-test-server before image build recipe = "rust" @@ -73,156 +73,90 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): 'src/librustdoc', 'src/rustdoc-json-types', 'src/tools/compiletest/src/common.rs', + 'src/tools/jsondoclint', 'src/tools/lint-docs', + 'src/tools/replace-version-placeholder', 'src/tools/rust-analyzer', 'src/tools/rustdoc-themes', 'src/tools/tidy', 'tests/assembly/asm/aarch64-outline-atomics.rs', + 'tests/codegen/abi-efiapi.rs', + 'tests/codegen/abi-efiapi.rs', 'tests/codegen/abi-main-signature-32bit-c-int.rs', 'tests/codegen/abi-repr-ext.rs', + 'tests/codegen/abi-sysv64.rs', 'tests/codegen/abi-x86-interrupt.rs', + 'tests/codegen/align-byval.rs', + 'tests/codegen/align-fn.rs', + 'tests/codegen/asm-powerpc-clobbers.rs', + 'tests/codegen/async-fn-debug-awaitee-field.rs', + 'tests/codegen/binary-search-index-no-bound-check.rs', 'tests/codegen/branch-protection.rs', + 'tests/codegen/call-metadata.rs', 'tests/codegen/catch-unwind.rs', 'tests/codegen/cf-protection.rs', + 'tests/codegen/debug-column.rs', + 'tests/codegen/debug-limited.rs', + 'tests/codegen/debuginfo-generic-closure-env-names.rs', + 'tests/codegen/drop.rs', + 'tests/codegen/dst-vtable-align-nonzero.rs', + 'tests/codegen/enable-lto-unit-splitting.rs', 'tests/codegen/enum-bounds-check-derived-idx.rs', + 'tests/codegen/enum/enum-u128.rs', + 'tests/codegen/fn-impl-trait-self.rs', 'tests/codegen/force-unwind-tables.rs', + 'tests/codegen/inherit_overflow.rs', + 'tests/codegen/inherit_overflow.rs', + 'tests/codegen/inline-function-args-debug-info.rs', 'tests/codegen/intrinsic-no-unnamed-attr.rs', + 'tests/codegen/intrinsics/mask.rs', + 'tests/codegen/intrinsics/transmute-niched.rs', 'tests/codegen/issues/issue-103840.rs', 'tests/codegen/issues/issue-47278.rs', + 'tests/codegen/issues/issue-73258.rs', 'tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs', + 'tests/codegen/issues/issue-75546.rs', + 'tests/codegen/issues/issue-77812.rs', + 'tests/codegen/issues/issue-98156-const-arg-temp-lifetime.rs', 'tests/codegen/lifetime_start_end.rs', + 'tests/codegen/llvm-ident.rs', 'tests/codegen/local-generics-in-exe-internalized.rs', + 'tests/codegen/mainsubprogram.rs', 'tests/codegen/match-unoptimized.rs', + 'tests/codegen/move-operands.rs', 'tests/codegen/noalias-rwlockreadguard.rs', 'tests/codegen/non-terminate/nonempty-infinite-loop.rs', 'tests/codegen/noreturn-uninhabited.rs', 'tests/codegen/repr-transparent-aggregates-3.rs', + 'tests/codegen/repr/transparent-mips64.rs', 'tests/codegen/sse42-implies-crc32.rs', 'tests/codegen/thread-local.rs', 'tests/codegen/uninit-consts.rs', + 'tests/mir-opt/', 'tests/pretty/raw-str-nonexpr.rs', 'tests/run-make', - 'tests/run-make/cdylib-fewer-symbols/foo.rs', - 'tests/run-make/doctests-keep-binaries/t.rs', - 'tests/run-make-fulldeps', - 'tests/run-make/issue-22131/foo.rs', - 'tests/run-make/issue-36710/Makefile', - 'tests/run-make/issue-47551', - 'tests/run-make/pgo-branch-weights', - 'tests/run-make/pgo-gen', - 'tests/run-make/pgo-gen-lto', - 'tests/run-make/pgo-indirect-call-promotion', - 'tests/run-make/pgo-use', - 'tests/run-make/pointer-auth-link-with-c/Makefile', - 'tests/run-make/profile', - 'tests/run-make/static-pie', - 'tests/run-make/sysroot-crates-are-unstable', - 'tests/run-make/target-specs', 'tests/rustdoc', - 'tests/rustdoc/async-move-doctest.rs', - 'tests/rustdoc/async-trait.rs', - 'tests/rustdoc/auto-traits.rs', - 'tests/rustdoc/check-source-code-urls-to-def.rs', - 'tests/rustdoc/comment-in-doctest.rs', - 'tests/rustdoc/const-generics/const-generics-docs.rs', - 'tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs', - 'tests/rustdoc/cross-crate-hidden-impl-parameter.rs', - 'tests/rustdoc/cross-crate-links.rs', - 'tests/rustdoc/cross-crate-primitive-doc.rs', - 'tests/rustdoc/doctest-manual-crate-name.rs', - 'tests/rustdoc/edition-doctest.rs', - 'tests/rustdoc/edition-flag.rs', - 'tests/rustdoc/elided-lifetime.rs', - 'tests/rustdoc/external-macro-src.rs', - 'tests/rustdoc/extern-html-root-url.rs', - 'tests/rustdoc/extern-impl-trait.rs', - 'tests/rustdoc/hide-unstable-trait.rs', - 'tests/rustdoc/inline_cross/add-docs.rs', - 'tests/rustdoc/inline_cross/default-trait-method.rs', - 'tests/rustdoc/inline_cross/dyn_trait.rs', - 'tests/rustdoc/inline_cross/impl_trait.rs', - 'tests/rustdoc/inline_cross/issue-24183.rs', - 'tests/rustdoc/inline_cross/macros.rs', - 'tests/rustdoc/inline_cross/trait-vis.rs', - 'tests/rustdoc/inline_cross/use_crate.rs', - 'tests/rustdoc/intra-doc-crate/self.rs', - 'tests/rustdoc/intra-doc/cross-crate/additional_doc.rs', - 'tests/rustdoc/intra-doc/cross-crate/basic.rs', - 'tests/rustdoc/intra-doc/cross-crate/crate.rs', - 'tests/rustdoc/intra-doc/cross-crate/hidden.rs', - 'tests/rustdoc/intra-doc/cross-crate/macro.rs', - 'tests/rustdoc/intra-doc/cross-crate/module.rs', - 'tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs', - 'tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs', - 'tests/rustdoc/intra-doc/cross-crate/traits.rs', - 'tests/rustdoc/intra-doc/extern-builtin-type-impl.rs', - 'tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs', - 'tests/rustdoc/intra-doc/extern-crate.rs', - 'tests/rustdoc/intra-doc/extern-inherent-impl.rs', - 'tests/rustdoc/intra-doc/extern-reference-link.rs', - 'tests/rustdoc/intra-doc/issue-103463.rs', - 'tests/rustdoc/intra-doc/issue-104145.rs', - 'tests/rustdoc/intra-doc/issue-66159.rs', - 'tests/rustdoc/intra-doc/pub-use.rs', - 'tests/rustdoc/intra-doc/reexport-additional-docs.rs', - 'tests/rustdoc/issue-18199.rs', - 'tests/rustdoc/issue-23106.rs', - 'tests/rustdoc/issue-23744.rs', - 'tests/rustdoc/issue-25944.rs', - 'tests/rustdoc/issue-30252.rs', - 'tests/rustdoc/issue-38129.rs', - 'tests/rustdoc/issue-40936.rs', - 'tests/rustdoc/issue-43153.rs', - 'tests/rustdoc/issue-46727.rs', - 'tests/rustdoc/issue-48377.rs', - 'tests/rustdoc/issue-48414.rs', - 'tests/rustdoc/issue-53689.rs', - 'tests/rustdoc/issue-54478-demo-allocator.rs', - 'tests/rustdoc/issue-57180.rs', - 'tests/rustdoc/issue-61592.rs', - 'tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs', - 'tests/rustdoc/issue-75588.rs', - 'tests/rustdoc/issue-85454.rs', - 'tests/rustdoc/issue-86620.rs', - 'tests/rustdoc-json', 'tests/rustdoc-js-std', - 'tests/rustdoc/macro_pub_in_module.rs', - 'tests/rustdoc/masked.rs', - 'tests/rustdoc/normalize-assoc-item.rs', - 'tests/rustdoc/no-stack-overflow-25295.rs', - 'tests/rustdoc/primitive-reexport.rs', - 'tests/rustdoc/process-termination.rs', - 'tests/rustdoc/pub-extern-crate.rs', - 'tests/rustdoc/pub-use-extern-macros.rs', - 'tests/rustdoc/reexport-check.rs', - 'tests/rustdoc/reexport-dep-foreign-fn.rs', - 'tests/rustdoc/reexport-doc.rs', - 'tests/rustdoc/reexports-priv.rs', - 'tests/rustdoc/reexports.rs', - 'tests/rustdoc/rustc,-incoherent-impls.rs', - 'tests/rustdoc/test_option_check/bar.rs', - 'tests/rustdoc/test_option_check/test.rs', - 'tests/rustdoc/trait-alias-mention.rs', - 'tests/rustdoc/trait-visibility.rs', + 'tests/rustdoc-json', 'tests/rustdoc-ui/cfg-test.rs', 'tests/rustdoc-ui/check-cfg-test.rs', 'tests/rustdoc-ui/display-output.rs', 'tests/rustdoc-ui/doc-comment-multi-line-attr.rs', 'tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs', 'tests/rustdoc-ui/doc-test-doctest-feature.rs', + 'tests/rustdoc-ui/doc-test-rustdoc-feature.rs', 'tests/rustdoc-ui/doctest-multiline-crate-attribute.rs', 'tests/rustdoc-ui/doctest-output.rs', - 'tests/rustdoc-ui/doc-test-rustdoc-feature.rs', 'tests/rustdoc-ui/failed-doctest-compile-fail.rs', 'tests/rustdoc-ui/issue-80992.rs', 'tests/rustdoc-ui/issue-91134.rs', + 'tests/rustdoc-ui/no-run-flag.rs', 'tests/rustdoc-ui/nocapture-fail.rs', 'tests/rustdoc-ui/nocapture.rs', - 'tests/rustdoc-ui/no-run-flag.rs', 'tests/rustdoc-ui/run-directory.rs', 'tests/rustdoc-ui/test-no_std.rs', 'tests/rustdoc-ui/test-type.rs', - 'tests/rustdoc/unit-return.rs', + 'tests/ui-fulldeps/', 'tests/ui/abi/stack-probes-lto.rs', 'tests/ui/abi/stack-probes.rs', 'tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs', @@ -233,31 +167,10 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): 'tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs', 'tests/ui/drop/dynamic-drop.rs', 'tests/ui/empty_global_asm.rs', - 'tests/ui-fulldeps/deriving-encodable-decodable-box.rs', - 'tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs', - 'tests/ui-fulldeps/deriving-global.rs', - 'tests/ui-fulldeps/deriving-hygiene.rs', - 'tests/ui-fulldeps/dropck_tarena_sound_drop.rs', - 'tests/ui-fulldeps/empty-struct-braces-derive.rs', - 'tests/ui-fulldeps/internal-lints/bad_opt_access.rs', - 'tests/ui-fulldeps/internal-lints/bad_opt_access.stderr', - 'tests/ui-fulldeps/internal-lints/default_hash_types.rs', - 'tests/ui-fulldeps/internal-lints/diagnostics.rs', - 'tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs', - 'tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs', - 'tests/ui-fulldeps/internal-lints/query_stability.rs', - 'tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs', - 'tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs', - 'tests/ui-fulldeps/issue-14021.rs', - 'tests/ui-fulldeps/lint-group-denied-lint-allowed.rs', - 'tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs', - 'tests/ui-fulldeps/lint-pass-macros.rs', - 'tests/ui-fulldeps/regions-mock-tcx.rs', - 'tests/ui-fulldeps/rustc_encodable_hygiene.rs', - 'tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs', 'tests/ui/functions-closures/fn-help-with-err.rs', 'tests/ui/linkage-attr/issue-10755.rs', 'tests/ui/macros/restricted-shadowing-legacy.rs', + 'tests/ui/numbers-arithmetic/u128.rs', 'tests/ui/process/nofile-limit.rs', 'tests/ui/process/process-panic-after-fork.rs', 'tests/ui/process/process-sigpipe.rs', diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 83a0dbc15f..e02829e6b3 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -10,6 +10,10 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0004-musl-Define-O_LARGEFILE-for-riscv32.patch;patchdir=${RUSTSRC} \ file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC} \ + file://cargo-path.patch;patchdir=${RUSTSRC} \ + file://custom-target-cfg.patch;patchdir=${RUSTSRC} \ + file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ + file://target-build-value.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e"