From patchwork Thu Jan 23 15:47:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sadineni, Harish" X-Patchwork-Id: 56008 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 C7A97C0218C for ; Thu, 23 Jan 2025 15:49:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.13939.1737647378652320717 for ; Thu, 23 Jan 2025 07:49:38 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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.178.238, mailfrom: prvs=31187efd39=harish.sadineni@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50N9vhQb026689 for ; Thu, 23 Jan 2025 15:49:37 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2173.outbound.protection.outlook.com [104.47.73.173]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44aqfw1upc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Jan 2025 15:49:37 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hOryRhcewQAPyG6yPuMixtdl0JrJWJKH0uvljBfj7+OwpeeSR0KcKrS1rcbND29PJXakUbYb6oZF0twB1vvN7TDkmo7Kx3w1OqJs8tAdf3oHZxmPo17WNVC3w/VeMdUT/QVMWC6J526y+ukMckk/BJEdyyPgrL7aQbxbD/Xu3bWvQqXxKVT98XAyelkHK+3BIX9RX3WrplLhQHRoGgnhhKC7mYNd74OIs8efPd+455qioifPw4VWTZen70CDb2C/JRRKPDzxknvf4QcVK3wSgFAYXi5sEV/vNeH1qHnVsT5D/vC8H3RkmaDspzao/vrIzARLHfaJ8uksuehQ9xV7DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=tl+cwfdZIh9yQP0pl3VHjcMhrL3HSBo8oDScTVLNo7A=; b=pr+MCMx9dHH81iU4q/Ee1g0Z8Oed2S3j+k8/xC+sNHZFw1uFG5vMFGNbUSgNTbVwUFyf8Nw91ChFJKgermiGREuyhnj4ZIYObcdFBduAFnf+4aqKdTid1MSKcT4Y7I1yIFeCSFOCm4R1yJThNL8wFgyfgcXYFnrpf+NTEg62lJq5Ugg5PqKzBOP10JcQdvNFD5Cds28AnGsbbeziXX9t65pTuZVSvDyJ4jlzH2zNVedt8Xis0pYGQsQlg+vjcUDeMRIG77vkLh4ZJKlun7hK90PVxvUMSoXdGzrIW2EW9Ucu5/XgXnoWUw+Oe5T1SDdEnGfMvLlSK1UpBaO/Y6it8w== 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 PH0PR11MB5658.namprd11.prod.outlook.com (2603:10b6:510:e2::23) by BL1PR11MB5255.namprd11.prod.outlook.com (2603:10b6:208:31a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.22; Thu, 23 Jan 2025 15:49:33 +0000 Received: from PH0PR11MB5658.namprd11.prod.outlook.com ([fe80::f440:269f:9645:29c0]) by PH0PR11MB5658.namprd11.prod.outlook.com ([fe80::f440:269f:9645:29c0%4]) with mapi id 15.20.8356.020; Thu, 23 Jan 2025 15:49:33 +0000 From: Harish.Sadineni@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com Subject: [PATCH V3 1/3] rust: fix for rust multilib sdk configuration Date: Thu, 23 Jan 2025 07:47:53 -0800 Message-ID: <20250123154755.3579988-1-Harish.Sadineni@windriver.com> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: SJ0PR03CA0149.namprd03.prod.outlook.com (2603:10b6:a03:33c::34) To PH0PR11MB5658.namprd11.prod.outlook.com (2603:10b6:510:e2::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR11MB5658:EE_|BL1PR11MB5255:EE_ X-MS-Office365-Filtering-Correlation-Id: c849aa5e-026f-422b-8829-08dd3bc58813 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: DUg/ZDwIa79Cbb7ADeA7svezsOm5WTzauaQPZrPdnCeUcjCM5kq2MwWWRRpJeg6kc56vfoCxEUP0fUAAinG7PWXVFcugIMwaLJ/GGZUV70+ML0UgjoJPGLLczcZfvlLJczslS7MlZOWBBWD/+QgmxQJ+PAIWyh+NCiSes1pgGJcPKnsHr4hss/T1iJwBbSwqISAVCqcetwfhjzCBYl/j5o6QXEJLg6xWuTHcgPAlIMAqYGxuqZsmRDtFAkuCA8scXrvhZ+oxMLkw2RL0lNdhj+2J4eO7Zl+rgs0bzSYUtHIMS1nsCCI1Su1F9h98vvf1DPnZcipPTNfyysqH6kDjOQd1BqGl9suUsa3ufPJPv1/b7fetiBtS02HboSvvHkT4fLcEeGV5IcSstUwSsAuVVGEa2AyyOW0VSQCSxziXeg3E3oORwoJfo5gcg8JKlV/ppL/h9HLKQf3sQ84cc9VDgfRoG6wFyc3ENPJNTcqI0ZH1rKu1gSFB9SuPTySFtZRaV/M0GKQlEOMjroUKq+8L6mkkGzeF4sp6UEp2S+eLK18vrQOYcHicmtJtUBnomE/wG+N2jYXlTW7l3rQpj70QnmsHCoaP3gvlyyM+9IKPgXLZOfatHz8Ma/gOMQKhpX3fNucutqgTgX2705/wwt/uOY9qUPlbBqjrBk30TYybGkO4T+hi1f8gLCKjXAxeU4WSHJkjLn1v+MQDCFYYqSHtzxxlyYacLz7cffBgzTYY2UhkcskgdSBy22urm/B9KA+4JxIkIKwh2bcBh1nhnCboL6qE7RcOzzgGhgslgPama6vHF2T1AwW04zfsK/XsjrEH/zX3YjGkuaazUYZJgQyFhfOLx5hvL/ScXk2J/s8oSp6orxFgp6bWbjDDn+mwaxP0sD5TNcwxXPTXvhx78C+4OSXvMkUMZXYNMRMHszMB00LCmjpCR18iYapyNAWWq/vDE49zJ1lIFkt8VgsFPtfhM2AOIYxXnFZxzUVuBvT1pnAjEkogILvxUhpWOsh/OjRrXqgpJWMJlQC3xcxMMou/u9wyU2Gw1on5fIWxLY/2JiUrps3Tmhr78BP7E+Sx+PfqVTEpwm0Vg68dSVxc9xp84K6+1BOedf4VWr2SH74NYWaMvEhXEjh4Xyu28B4GK0ABCgN01VH1NKQ3wlfU6LkWhggp/gmdOuxFj+ik33+x7EwpY5luJayg/P4yXuymLpDgiPjHfmGfVJ4bSnBsjOFu2hr8Bj2+9jme5pwXpwf1iN/uijDjx4KpKtRiiRnn5Sz6Ee4wKEI0wnvfPu3vFNWT9lajvmGKxivttn255A2OS3I0qf1r7Rr85nlohPebyVTnWZJrm4EUT4OWroIyU5k+FyrOrj8lOMYo+G5+dX4/rDhmky5Yz3FskLJ8rVNZXxp9sMB1TjjlNfOvJGt2aYrIzg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5658.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1LG5EkSaMpwX1+m1uOlVtdBJS6ofuBrEfGGMThKjwGe9uzzoZaP/0ZnJaXHSLvPYPk04hovJv8qxubmAlPjbtt0PpmwRLKiy3MjS74V3ydvcsSKVKX/GFAPaGgdJTt06E/kAA9qCwTwzFcGt0+aooUkWeysr6+ln7OM71+J2gkXTzbsQP5uC6iCkoiOYaqMvlhLIIjrctkOSDhtZwwgD9oPhBfu/u5Ey/5zTRQABU6Lmymh4YzugkN4Rwn8YalkMkMDQiHUXn//dA5L23XPwHNkJH8NPJcH/FuGOo69AJoXR6FglCGJCOyErlf9TBlnNensG50fs3/QdPLS5pnw30Q6RW8tnE/Mar2G+D7bZtttnBjfEDd8fnZOUe7NIwza2wxqmx4xDVnxvyJtT2JjIus4LeN70mq/kezitYq41rC3FdbX2gitrxKB/uMV2A2avuJBk0nIV70u/aRloMPGmm6NK4wHf64y52p1maabKqBC+m/KweIdxYtgm7dKKBAuD16mL77ur3p501uZuqnTt0o6+OA/bjrtunN4RQFlPIHrQX1z8VSRPJV8G1mTYTvV6icO+ONc5CIvlkAnW/8d+6UJlUatnkqQ/dXs1P+xLdP1vFKZNnSPRu85sHIeY5oTOCqGGlp/6N5dmYK6yHBJpqnjsje5LtTLp5kuasrUVuImDuUVvj25oAmAYjR51c/+UfOSwURSqDDhzW9TmZMF3p6wflct27Krq4O+JDKDorfhP4kIM3xbw6EXojb7o1hsPmdVslEbageW6XtAViG100oQCYaEFSwxYZdtZNmOx5Wl8IDI/byq7Rfrj4anquXVRqJPAYlkjAWehRhwoYXjVB1NKlEkN/WA2ODWWZR9q5uwxe99y2Mb9lVU3g+pHsABJY97ChmPrQqs99J25u366TrP9yvVlV9K8npxPIDwbTSQGfhWdvL9W3QEBYyU7Xm/LGUXKgbXJsIhXIDvUMTS3eTUvNwgdxpJLrkdkKLEz3KGorRgDlo4rpb4M8O9W25tPg/ahhNs1H59+jQXlJsN+97q+2RwdWJLaRrqAyI7qzZcZXUmgyZB0h7v7CvhYIEW6yb5bSMIWf2q5ePHEIojpTSP94cmU8YO+cdLby0tyOSECXfSp6N3S14bzq0i72rrbtS4OV5wNFhpUbK8wreU3mPQo7zEnpRIf67TG37HNHCANN6i4JCtTsV55Sa88FpI55bxv4rbNYQi7fWMFfTKnTbusQYNYkFLD7tQsaFngMQoBdtfdeMAuZokdRgpyonEipRspfQ6HQFT+93LgQCdCPQyFE65ihaXQolhjdviSKwQYusoCAJ4qeT7OQ0gF9HeT0JdWwd8zWlPWluF5kJi1tgcrnEftmQ/9o8Osypfb3Rmq2w5m5baGXS58PcZjTVp/35lZwiILh4P3hrPwtmvjdwknzxsLyK1SxTrvfWSV7eCZE3V6BwQLUho/BETCXu3rMkyIqM1OyGE80+33ahDpQJNYky2YwxdW9mfAItHFbHBFIQTbAyOghtd9p7c7O+2ebxeqHWJ5+17zpFwsYMwuLFRUtWl5QTKBP19wcNzoexDCtEQQrMgaLKt6BD8I3ZcWe5tzoOXvv6BXE5WrKFjBG5tUL4gUfNAzrTYOmN4E8kE= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c849aa5e-026f-422b-8829-08dd3bc58813 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5658.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2025 15:49:33.5093 (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: 3y/n05EVU/FGtJsaid/9z9aPI7TpS9aJT2pyWn1XLNri7Mp+90aq5lbxaoMdv06xlDeWC7jGgQW4PRH2z14sxHk7ZnWxB9Zb7uue2R9yfss= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5255 X-Authority-Analysis: v=2.4 cv=b/xI4sGx c=1 sm=1 tr=0 ts=67926511 cx=c_pps a=VzeH2YOhhDlPZ0WtbyP6yA==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=VdSt8ZQiCzkA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=7mOBRU54AAAA:8 a=t7CeM3EgAAAA:8 a=G3Sakq1ebUq8u8lUnCcA:9 a=wa9RWnbW_A1YIeRBVszw:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: ydvDm_GGLsfDnJcAJ4FOz8INrZfrGCh5 X-Proofpoint-ORIG-GUID: ydvDm_GGLsfDnJcAJ4FOz8INrZfrGCh5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-23_06,2025-01-23_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 impostorscore=0 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2501230117 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 ; Thu, 23 Jan 2025 15:49:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210196 From: Harish Sadineni YOCTO [#15061] The rust sdk installs both 'rust.sh' and 'cargo.sh' for lib32 and lib64 in the same location. This causes below error while installing the lib32 & lib64 binaries: Error: Transaction test error: file /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/environment-setup.d/cargo.sh conflicts between attempted installs of rust-cross-canadian-arm-1.67.1-r0.x86_64_nativesdk and rust-cross-canadian-aarch64-1.67.1-r0.x86_64_nativesdk file /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/environment-setup.d/rust.sh conflicts between attempted installs of rust-cross-canadian-arm-1.67.1-r0.x86_64_nativesdk and rust-cross-canadian-aarch64-1.67.1-r0.x86_64_nativesdk ERROR: Task (virtual:multilib:lib32:/media/build/poky/meta/recipes-sato/images/core-image-sato.bb:do_populate_sdk) failed with exit code '1' The change includes: - Prepending '${RUST_TARGET_SYS}' to 'rust.sh' to differentiate between target systems. - Moving the non-target-specific environment variables to 'nativesdk-cargo' and 'nativesdk-rust', instead of being managed by the cross-canadian recipe. Signed-off-by: Harish Sadineni --- meta/recipes-devtools/rust/cargo_1.81.0.bb | 13 +++++++++++++ meta/recipes-devtools/rust/rust-cross-canadian.inc | 10 +--------- meta/recipes-devtools/rust/rust_1.81.0.bb | 12 ++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/meta/recipes-devtools/rust/cargo_1.81.0.bb b/meta/recipes-devtools/rust/cargo_1.81.0.bb index 123032cdf7..db18ecfda9 100644 --- a/meta/recipes-devtools/rust/cargo_1.81.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.81.0.bb @@ -50,8 +50,21 @@ do_install:append:class-nativesdk() { # sets to libdir but not base_libdir leading to symbol mismatches depending on the # host OS. Fully set LD_LIBRARY_PATH to contain both to avoid this. create_wrapper ${D}/${bindir}/cargo LD_LIBRARY_PATH=${libdir}:${base_libdir} + + ENV_SETUP_DIR=${D}${base_prefix}/environment-setup.d + mkdir "${ENV_SETUP_DIR}" + CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh" + + cat <<- EOF > "${CARGO_ENV_SETUP_SH}" + # Keep the below off as long as HTTP/2 is disabled. + export CARGO_HTTP_MULTIPLEXING=false + + export CARGO_HTTP_CAINFO="\$OECORE_NATIVE_SYSROOT/etc/ssl/certs/ca-certificates.crt" + EOF } +FILES:${PN} += "${base_prefix}/environment-setup.d" + # Disabled due to incompatibility with libgit2 0.28.x (https://github.com/rust-lang/git2-rs/issues/458, https://bugs.gentoo.org/707746#c1) # as shipped by Yocto Dunfell. # According to https://github.com/rust-lang/git2-rs/issues/458#issuecomment-522567539, there are no compatibility guarantees between diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index 25c0e64ba1..846dde4dc6 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -54,15 +54,12 @@ do_install () { ENV_SETUP_DIR=${D}${base_prefix}/environment-setup.d mkdir "${ENV_SETUP_DIR}" - RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh" + RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/${RUST_TARGET_SYS}_rust.sh" RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'` - RUST_HOST_TRIPLE=`echo ${RUST_HOST_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'` - SDKLOADER=${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('SDK_ARCH', 'ppc64le', 'ld64.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'riscv64', 'ld-linux-riscv64-lp64d.so.1', '', d)} cat <<- EOF > "${RUST_ENV_SETUP_SH}" export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT" - export CARGO_TARGET_${RUST_HOST_TRIPLE}_RUNNER="\$OECORE_NATIVE_SYSROOT/lib/${SDKLOADER}" export RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib" EOF @@ -81,11 +78,6 @@ do_install () { echo '[target.'${RUST_TARGET_SYS}']' >> "\$CARGO_HOME/config" echo 'linker = "target-rust-ccld"' >> "\$CARGO_HOME/config" fi - - # Keep the below off as long as HTTP/2 is disabled. - export CARGO_HTTP_MULTIPLEXING=false - - export CARGO_HTTP_CAINFO="\$OECORE_NATIVE_SYSROOT/etc/ssl/certs/ca-certificates.crt" EOF } diff --git a/meta/recipes-devtools/rust/rust_1.81.0.bb b/meta/recipes-devtools/rust/rust_1.81.0.bb index b583508456..15ecbf74a0 100644 --- a/meta/recipes-devtools/rust/rust_1.81.0.bb +++ b/meta/recipes-devtools/rust/rust_1.81.0.bb @@ -272,8 +272,20 @@ rust_do_install:class-nativesdk() { rm ${D}${libdir}/rustlib/install.log rm ${D}${libdir}/rustlib/manifest* rm ${D}${libdir}/rustlib/${RUST_HOST_SYS}/lib/libstd*.so + + ENV_SETUP_DIR=${D}${base_prefix}/environment-setup.d + mkdir "${ENV_SETUP_DIR}" + RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh" + RUST_HOST_TRIPLE=`echo ${RUST_HOST_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'` + SDKLOADER=${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('SDK_ARCH', 'ppc64le', 'ld64.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'riscv64', 'ld-linux-riscv64-lp64d.so.1', '', d)} + + cat <<- EOF > "${RUST_ENV_SETUP_SH}" + export CARGO_TARGET_${RUST_HOST_TRIPLE}_RUNNER="\$OECORE_NATIVE_SYSROOT/lib/${SDKLOADER}" + EOF } +FILES:${PN} += "${base_prefix}/environment-setup.d" + EXTRA_TOOLS ?= "cargo-clippy clippy-driver rustfmt" rust_do_install:class-target() { export PSEUDO_UNLOAD=1 From patchwork Thu Jan 23 15:47:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sadineni, Harish" X-Patchwork-Id: 56009 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 C59CCC0218B for ; Thu, 23 Jan 2025 15:49:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.13940.1737647379144172607 for ; Thu, 23 Jan 2025 07:49:39 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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.178.238, mailfrom: prvs=31187efd39=harish.sadineni@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50N9vhQc026689 for ; Thu, 23 Jan 2025 15:49:38 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2173.outbound.protection.outlook.com [104.47.73.173]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44aqfw1upc-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Jan 2025 15:49:38 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E9/wxu26NwWTomtfrlZuAXNbfjBJycYutbrxmS0NmAnv+VTBY/HzV2PSGMNnfN8EQj7ra5vmjMLLvb9pIVy3EU/ZvjlOK1Q58G34LzkUT/QEgEIjtv2Fi7NKCmELn2S4p+VQ+7ZI8v6vCiR12g9ZlflidPiLQ3kvKAYNX7jJ0wJ+GsBNl0uSaOywV3Mmcir9DTS0qRVc54AwaKUT7ze2Os81NMUZRimjAVEGZs/fqmTNO9K13ga5uLVOkouGSj0YhoYfC2WSXKn20R0zbkE6UySrxz5pyuUvs8fOZe6mUMX09cwjcrWzyHQKpArCJV+o5jj0c4ZkWBKvoipDZkY+Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uTH4E80H2gAdtxwBg9XoSRVDbkU60Je/mhbl6Q6PYw4=; b=apw02r1bOgcUO6q9zMVh4fP9oM5ccPtzaE67sb0l5e/8ee/M1OKHZF8Cc4QosF7HDe1mPPy7DaVNQ45aSjmMWH9UfDhRwuya2QOFhelI4Mh3Dqk1kwbtlc1eBY4jCoqytQRU8jry4C6ez1MvGgj17FTOOr+tvwN2TimhHffJFj83aJoIdriQyXECv610go/U/u9ysibcXyXNUYKqkb7NYiVVBzYh1QcfaTj+K0yKGJ0Zs07mc76AEimVK3Q6y8ln2UOGpuPafn7dmVG8jCs/AFGok3Uod6zU67uontdpUy4JlzBnsl9bJ+Q8VBSqlgY/QB0xJikCiEOLJh8ruIx4Nw== 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 PH0PR11MB5658.namprd11.prod.outlook.com (2603:10b6:510:e2::23) by BL1PR11MB5255.namprd11.prod.outlook.com (2603:10b6:208:31a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.22; Thu, 23 Jan 2025 15:49:36 +0000 Received: from PH0PR11MB5658.namprd11.prod.outlook.com ([fe80::f440:269f:9645:29c0]) by PH0PR11MB5658.namprd11.prod.outlook.com ([fe80::f440:269f:9645:29c0%4]) with mapi id 15.20.8356.020; Thu, 23 Jan 2025 15:49:36 +0000 From: Harish.Sadineni@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com Subject: [PATCH V3 2/3] rust: remove redundant cargo config file Date: Thu, 23 Jan 2025 07:47:54 -0800 Message-ID: <20250123154755.3579988-2-Harish.Sadineni@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250123154755.3579988-1-Harish.Sadineni@windriver.com> References: <20250123154755.3579988-1-Harish.Sadineni@windriver.com> X-ClientProxiedBy: SJ0PR03CA0149.namprd03.prod.outlook.com (2603:10b6:a03:33c::34) To PH0PR11MB5658.namprd11.prod.outlook.com (2603:10b6:510:e2::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR11MB5658:EE_|BL1PR11MB5255:EE_ X-MS-Office365-Filtering-Correlation-Id: 696a3dfc-5065-4885-b523-08dd3bc58984 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: lPKtzy0kEOEByG2Fxo8HuyRlYgbeJw41CB7qvgyvcifFgxeup6HWU2JmkOHgym/ddC/xAcOCrLKe/VEYWbYZmlGMxE0NttLt5o0p4WcTPTss/AgDM5WcjWmwlaSVvhdrqlXBme4cHETCsU8JXoJHz/EGYXeX9kZ5/5E/i6cRpJX9ZjpEDWNoub+wSj3VpLYDFnYNxUF0bc7qzuFQZ/uPARz1uaSqRsn+/xBX53TGJ2WPICBQT/f4FNahCCgpq2hSpM+1uBaFeLe0hDtrbWGdFbDm/Wp5rLPn1kGpJrs76pqff+xf3VWV5TEmkUVc16XeF3LlrevWsSo+SDH/SFgI2Q4N5L6QAEcW0cSmysjVtK1pjj0cnCMgxnkdgKL7QbQymYwxxz/oSdkYSwmeVK5+Ch1ckmqaA3BFa5ai7j6CaCyoK4iB//XXLJOWbo6ThUBB0VJksnJMCdKycJdXm9pvHX/zpcuqavXarhKVuNYhY1RgO/AOI5FuuUl8yvYTXLClKJf3t3VC8iPOiT0a90SiA/4BK2HyeGmUkx8gBrUVhdjZ4P8xmAm+Pw7lDllOr4Rz4ouewtJHGGU9vvnWfOh17N8gAKBHX7NDcv5J1ZAnO1d6x2bbm76E9pchR5DJ+NSMOMx3FH2Llmn1gNY4e6bU0zhtQzJdWcze93PF6VxKXQ3PQLrtIBlahwbABK3KB30p+DgF4t0rizBaki86ROXTXL+nV5pGLqJbUZL3yJvWhap0Dkr7hWiL8jpvA2Y/3+w7HAgKB6L3C3rnJEuYuHpEnft+0xZSywG+TDWCzsLCxHSgR0ByRRuGwif6Ee8jH+N6P1SnH8MTGgp2NtsKxs+wGIm+N4tplXQmkDC1flb1DtPRfUokE8Gn4rYDEgSrFrhMf4Mt2e9yQXRSeijNmKx+mVTkb1zwZnvExBEpq9+mlOvLeNLAzzcG47to1fvP3vOLoCQXdJvi3hK1+Yixi4Is1TW2+iyOiRy36GHLck/rj4zM1IUCsZah1DCLpUw0w6ZbbnbBvGRiU/hMCuEH8ra89Fxbm9N9/3GGIMI7QOO6DoKWwJKXMRXz2Mm/f/SSCtn+nOa/2dQYMd6LzgBQPDZK6WAbLg9UUt5248+4zNaPZsinq7D4zI3cpRmKOMhNzPzOZwfjS/yAlxmhkI4uFYbM/RtipuJgCLkdROAg90abM6MuPTAU4A2w25Qbm5iqn0lIbLLksmOpE7sisAR8L/VkzkBH2zkFKY5QHbxsTCBDBZZy3GHivycop2vj0a5QG57XJD+R4gvsRHWpLnrRDkN6Rzqga3VrHAjH7yh/UieLFVCqwroLeCNrmwMQs3STY4KU5DP93R9zi9bOTEiluE7P5cvXrP3amq0HM/kHVWFh5LycfCIFlA4nDUgXQ9Cm9RUE+9MNBe6kqUkWXqAKU0JkPLgQp/7+rQxsznycn5dXTi65pCqoC3dX89ucz/hp7OpW X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5658.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NW0gB4wT+u2uL3d8OpcJXyKRPsa8BVzIP7YG0QKOdLXsTSB3DY01CE09ujegeeg92cpEyumdjtvFzB6L+uWF7dbFTUSViXuWPJBE7apLEHjBt4XInc7ABQvfbEA6G3o5s64B8mXvzkUc0qxm6ryW6o6A02BrdKzic1unizU5owr5LPCBSVBKh632DenXHi0WnFP8BloZ33ulZvK7y3isu2s2kxQWguI484bgOLvd/rb2vBG04L6KYdVak59lc7BPzI/zcOZuyzXhkmN0RrDJKPzwAECohS//lMZJdOCqu/l4JPDrzr1eCxsVVG7FzP7pPYRqrOObUCkBij1AVg9Bz1ELv6FZYuP/0b1GbTN3uPvMiqgxEnRR3DGp22XsNva88WGpX8Kolt8Rl3U8vo1WTQa55xc6jOcVjMRXFWQD+6x8x8f/jt8VCwshC3WxAcK6tunssvYt7Z0CWIWaHJOlpoGAR48IABVERvnOOWcJTtC5dqZ/KC3kkAQu1x9/TldYMcdpFZbZN0r+Mvl2vrTqBpLaOKFt5KsPTW+0vRFGxSZPIYU6xRUuNkH2s9EFvIzix9U21YS1AzYSUjfpvRfkX/vaW3lbzm3VJhgb969KCFYGq+xX0cQD453BYoa1A/eJzhyivrzIicEqxrbYEXz/O7RJozZ9F/wmqo16ONAIvwxrK35T5Z9FY8H7OMhy//K3+iWnZHS31rBDUmvkP0DQGn0T13/XLNEB2HBZQijGFl5tnNAbVwBJBLOlqGy41qVHsVEGCXCovBCuwzxUoZATts7dhX+Kz6GEHpNiZ6qrfb3tXsnTEswrjlGdSFuUKYpbl1eDHdDOhSBDr3odOglIbAId27r92d4n0F6RxWCDW4OUwnCjX1dgDhnqDDQBhvNJJVbT4SLelgia0JcuuYkZd4jUqh4MzodiBRcCllwC7dEGdd1J/X1o4S8kjm18XLofo5O7mc1uzDIFy7PnT+2hko42YK72Xm9vI1A4M9T5qz8ThCPK/vXOzyFONJgbEPT4Uvgw3Y1ToNDVSG+GoZTgkAGeQoTWXsz+tEdcIof0hhALVS27YX4BGqDyMFWUIZp01V0bTTjrlFdcGtKh/d2EmAsEXUetzNKFHVO/U6uc4WrXjNZYl95H02ZJ0WydnPCnPBM6bkqYLVNiTxnxd/sWZKXSPQXbQpEAru1BJyj7OeMhlDcpp3S+bwxnfChJ+xYqy/NSS499Yr9pl1uAKlGixXtm13O03461ZfXkbogA1SQz0XQZQ71bkpgZqpc3DIZPBsxoSx2A7f7yg1bsuIFqKkDw13rYRUX9YaCcXkiY0P5DisrPar5Yzla5cRmIDnZMbOFyLBO4t3pjNuhmrdKzO5j1hdh13sxVK8d7eJGKdcVtkGThpTso1sKgd0EsDvm/tgnxSCwQBeeT1WdLZkIVPaOyGY9KLc7T+qzYerFJLpgL/N1yysOqxJaT0a2TB5aJ9ZKKQBVqDK8iXgipKYkj7EAoMWxlfx5ztyE2TuptnjN0CknG5baFi+0mzG7h9hOhUuT6fgs4Io94TBOxC8NI0Xs8QKGJZnForwoSM4Q97gK5guw7Yjyg/1RQFvFMslVI2Yqce1f8NWI0zvWNYLKcLLDjWO6aSZZyVqBmqQ1Dl1k= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 696a3dfc-5065-4885-b523-08dd3bc58984 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5658.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2025 15:49:35.9472 (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: G5+r2+r9MCxPp/JLwIR9P8DkpWDe7oL35l7nSr1Z/tzdetwk6NNh9gKL4Iig/LmR08hh6m4gXOnl5cdPhPUkwWb2Yq5fdHPl60FDm0cH1h0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5255 X-Authority-Analysis: v=2.4 cv=b/xI4sGx c=1 sm=1 tr=0 ts=67926512 cx=c_pps a=VzeH2YOhhDlPZ0WtbyP6yA==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=VdSt8ZQiCzkA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=jCXEwfVgUjATtFLOCtYA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: pZyOdaIh7nphMAfp4uPBCuecSIzd0Oud X-Proofpoint-ORIG-GUID: pZyOdaIh7nphMAfp4uPBCuecSIzd0Oud X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-23_06,2025-01-23_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 impostorscore=0 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2501230117 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 ; Thu, 23 Jan 2025 15:49:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210197 From: Harish Sadineni YOCTO [#15061] The rust target and linker are getting setting from the sdk environment and so the config file is not needed. The redundant config file geneartion is removed. Signed-off-by: Harish Sadineni --- meta/recipes-devtools/rust/rust-cross-canadian.inc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index 846dde4dc6..09e1b911a2 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -65,20 +65,6 @@ do_install () { chown -R root.root ${D} - CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh" - cat <<- EOF > "${CARGO_ENV_SETUP_SH}" - export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo" - mkdir -p "\$CARGO_HOME" - # Init the default target once, it might be otherwise user modified. - if [ ! -f "\$CARGO_HOME/config" ]; then - touch "\$CARGO_HOME/config" - echo "[build]" >> "\$CARGO_HOME/config" - echo 'target = "'${RUST_TARGET_SYS}'"' >> "\$CARGO_HOME/config" - echo '# TARGET_SYS' >> "\$CARGO_HOME/config" - echo '[target.'${RUST_TARGET_SYS}']' >> "\$CARGO_HOME/config" - echo 'linker = "target-rust-ccld"' >> "\$CARGO_HOME/config" - fi - EOF } FILES:${PN} += "${base_prefix}/environment-setup.d" From patchwork Thu Jan 23 15:47:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sadineni, Harish" X-Patchwork-Id: 56007 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 C3BCDC02182 for ; Thu, 23 Jan 2025 15:49:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.13942.1737647380528091436 for ; Thu, 23 Jan 2025 07:49:40 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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.178.238, mailfrom: prvs=31187efd39=harish.sadineni@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50N9vhQd026689 for ; Thu, 23 Jan 2025 15:49:39 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2173.outbound.protection.outlook.com [104.47.73.173]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44aqfw1upc-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Jan 2025 15:49:39 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h5Wk6HRQ4bfynR/fv5QBWs0gxEW9PxMSOBXVqraJS+A7VIwSRswSOpKR4Tn3KQj8oosWhIBrXDAWCR1Y2+iCVlj+6xtNEiLfFIBw8JcMWOiipcMAf1wMSX8rcji6R7hP71fvSmTNBG7LFFkwLKPng5AnM0bE19rtED7+0BbgkfiXgzIHsumxqE5Mbxtqbcg9quEjhR60UhPupza9lA6I+0AUqz55MmMOiKBbr8RGznDzbFkwVgDdDuNDAjKOMFLUsXj8vjblqD4yBNaDUD6l0lg8o2fkSqMWhTO/JY/9Dm6M48e/lovgJGoZA7rrxzfg8oVo9WVZvqTpuo2XaS8+hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=0jqkh//Sqd5j3nIuKPUtSppQpWFOorXmHFcywnT+PQE=; b=h6pzX6maeOEwwZMZjsXteBeeprnLWulvuRJ+415vSMLtCGlmnwOGXh/ed1pb/mP8OXYdT41i3FZuaQ+53GRQWPtdlTKlRFAmILTg3g8iOvqtTbpAz+/DaDruvWIG2sw100j1hMZBMd7SX8GHYrwHQ07EeVZELmSqAC3yNPgKHifldruhDdnCvtN9sjDlidNrcsAajLC55F+Blq3sEL/9OlmLH5ty2TSqNxv80JCZ+VPe8L01nLyOF8YSJVcREcJ/7Ir56QxYFF2Lb9uD1uwR82qra7eS5jfjnw1d/SaX0DnXNSSOg/pUzeWCklaY+QYD7YEsEa+HQfnixAIjZNPXZQ== 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 PH0PR11MB5658.namprd11.prod.outlook.com (2603:10b6:510:e2::23) by BL1PR11MB5255.namprd11.prod.outlook.com (2603:10b6:208:31a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.22; Thu, 23 Jan 2025 15:49:37 +0000 Received: from PH0PR11MB5658.namprd11.prod.outlook.com ([fe80::f440:269f:9645:29c0]) by PH0PR11MB5658.namprd11.prod.outlook.com ([fe80::f440:269f:9645:29c0%4]) with mapi id 15.20.8356.020; Thu, 23 Jan 2025 15:49:37 +0000 From: Harish.Sadineni@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com Subject: [PATCH V3 3/3] oeqa/sdk/context: fix for gtk3 test failure during do_testsdk Date: Thu, 23 Jan 2025 07:47:55 -0800 Message-ID: <20250123154755.3579988-3-Harish.Sadineni@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250123154755.3579988-1-Harish.Sadineni@windriver.com> References: <20250123154755.3579988-1-Harish.Sadineni@windriver.com> X-ClientProxiedBy: SJ0PR03CA0149.namprd03.prod.outlook.com (2603:10b6:a03:33c::34) To PH0PR11MB5658.namprd11.prod.outlook.com (2603:10b6:510:e2::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR11MB5658:EE_|BL1PR11MB5255:EE_ X-MS-Office365-Filtering-Correlation-Id: 961749b5-acea-46fc-6db8-08dd3bc58a23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: by6Ph4HGTJFEbQJxNiEzABXcNthiAQpMmbGvg/e8i7kBufKSiKMD7sqxLjlAKp1eNbH69f3SAeAHk0v7PSSfHvRSa0m6C/GikKAkgAt+3H59Z/ud8ScUWat4bCv7zMZ1HTtZzWWzUQ65NZqdoPfWIliXoZ7MCfmH6IkZ359SSUTRQRPbWQwSSpO3zatSCXBrJ0FrN6jmgjtFdvEqqLE2PB5b+yB69D8+23iMKBhLY6F5KBa0ZjnLpTS5RRPiJomcOhWNO7lKGhvOwlkQy7J4oAiBFGjKXKzrh8fHNTL29iX9HgcgLhB9chB/34+Q88ZV1v3m8QxmyzFAdzx94CyHDh8y2SCyyO+rQ12tleX5QyHjVJM6mIVwJJj+Jc/mfA/VGQPhqKnuuwHigrlykRaHkYOQ3MRQwSb5CeVa8FFWoEM4h7gFhN/IvSQTJjezkPENpH3rNp0vmUqxIwNGWOAIA2LkKKXnnjbqVQsiHqzCTVKsD2jB7HkkA3FLADGQYtwawi3EaxcTq+Av4fBj6Rk1QWOPBBsXqG7i/Dh76vCHlNmg/bG4SWYhLQlCOD5LrnOGol9Y4JYL6Acu77j3NzmvcK73fXiqCPhGH10yJ3fF7DPdPEemgtLtPgj65WmmGAxq4SgaJ6AxjO8n0yubdvZPnoly3hqJUEJke+NU1VTzO3GhO+5cG0sfnN+59SxjiSSw37PjlEqYgH12YXfYquPeRD+VjhSNo2M+OlVjzINlK1gm+NNuIjnBZyZCiBJSok/fMMYX/O/NfMdCCkMl5A9mf5G9MldQJBZYjIpfVDdNyrSZgav8O4b+9pSk8YR80E81Yy249Fgz8tPHz8frkqAQY0jCIUdv5CcjyQYSbmwtS2Hm7vcOW8NiDRUw8T5x7SaeNx7eyKBFHQZRZdFEL40x6/LPhVI0++DjpCSni9wecoaKKWtnr4WgTIPy9rm2qDmyMtm93l0uWa6ujhorbIL53xllJpy4xrl34unDt53kB59+1cdGw7R9CORdKDBpLhjAauZr1Ghx4kq25HekIK+rvYBhbiFzabXpW766R96G5XlePEPC6xODcDnIf0Uh3zDHd2vr0QLL4Tkdq4NkRWNF1INt2AyOb0zKo1Q9oY/pBg7sMI2Nv4WYFhXdWPvD3PpUDxY1WvT7F1eR26dD8OuZ3mK9rkP1Ny1gyi8FOGv/EERAH6gH4NWeO3f4qorWbU8aS8YAVIkg4M0A8KaSpNEfjoJ0kFZKVTQntg75+4NabuZkaKfIQMA75GmMz+uuFpuTp6kE7eToOy78RAWGRLXdFOaOygAEP5sccUEHGsITzzxC0bbqE9lcYmuSfVA/hmRhzdpne56KpLw49DJl39fMATrd362DzcjCDhTyTiayfWSQOEo2bmb8hyTLfCP0UMnfj6hdtBVUyoLU3/XoDQMNztfDw/nyvj7GgJIYQAzPMPCMWzSZeSNjHVPztJAT28of X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5658.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 69KRCd4hvb7srEe6L2jgjE9kHSszLf2ycRu5B/a4U/qmFLNKp8hhBAUWPWjcVy0tkTPquJVBs8JCTp3ZpFpuf53yvNlg4Qf0T/R6m9AnsbYzQYvHrJsfsx0UEVDQfgTEusks2ws8OndPdCO8nQCI36zY+QctdVpYoxBcAEdot2qs03d4fY5KbBvlKuDM3no+iamBY9B129gtOGk7xekGRgETi7EKjuleGa/0n6BbuvDOtJe+KYbjBDYkdcJmxy5lREm3sKbhcklHB/AfDZ6O739LJbH+ws0RxQiR+97L49UhrjGMDPLPcovGp75mz8x0iErm95zKtungEUvbCdKjBfM6/2BiP5jR98rWiXkC1hMfMiTG+yejrjWxvOl/z/DqCIRl74d4d8n52WH+h5AvFXJJvCeN3cgGJzuOmck2Gfk/MB0rG1lcadgbirycdL4SWRFdHIVCJurQPq0QUwSc1cPKNY5gVgKciUXeYufKmNjIxSqA1Da3JVLXf+1XtRZAsm1NpTsxkblR+/zIqQ3OV6v4CLmVmgOeDZTbns36OC8mymP2uEI8uP9cFgBGjmhiVzlLDQVKe+O08TduoGGKpglm0OXcp6QYwt8ZNKSBb2Dp1ITI+UafX1I8lHiuoRA3TTUsJ8MTil6I3l0kMimap1RgOyiUZ/oA/vYBjZ5tCvdF4JDlDCLGQELf9vXP0S2rvCPsg7Wc6F9nLa7amhZ4RRPC03oM/g3iftlDPejtEemDvn8cKNBCnH7wH8YhlmbxE0xhXWA7N8OY8ZG+BlZwoE4V13+6zuW0mDiO3qt6f0792zf0QVI9Yv89PZ7/jsfbhS55xsc2pW1EBhurNb+sLQ9f78maSTntjE7laGa5CvaGP3sTdDqqKmOmlHuBMDCyu/A6UyWC9Ng7vLI8GPOmtMCWwAYXDghsb/Ud2sTKdwdhRl3JuSELGhsCC0kqKNqRPvRHmQgOO8GdZjeZV3FLfb1ZgrP4zwMUmxKLJLlZfxU9MqhmQ7NCV4Bn4DqYqwUEPIUuP3lHnDl6f/DlmMxQ9duSQ7LyaD1ViKtpYDgN5zgZgnHaFYQUfB/kKVDlQqlYEF7WJH2yg4TvVSvqqaFKpjxrLiLf5JFApGb6/KOSZsbpBa97HXRQd16lG/lNuy1CdBBMh3bwJaQhVvG0ulwcEOm3DwQhl9LFW+PXvTaT7Gqv0N+d/sjFPXlhukD2aYTVpd3cK9EE4zey+MeEDhsYAJrf5ccJEdPGl95HlfZh6OlHl1abJpFUvx044TtnWNxmmzKU5Hyt/SFmkvIdZVBIc3XllDCsdYz30DySSFPAAJMtMD5rK+4WRdi8Z6vQF20udwIhARBptezcADiUEAmACZuAgVbZw7Hl8PPoz+MBfCc6AmDhprWOa9bjF3gwcvDLyIP9gv3ARqmvCsuWROjkRQ03My3eoZv8SOE4+a+73zV+/mmUc5x3Sq9COmHIw1cW2GiCitfvjEpeaQF+7mFH+utdmafvt1pxHY+EQMIeHvgU/ti/l41l1+q21qFeWHWOkCC3BwBPLWQTluJmsC8+I4rVc7s42L9uWjMewi8Vr/6e0GwsbZ/g+ZlMCKyv5mFa/IYPI251XyiYAAbcRcfZzBz62m9BqVbiok02Epf6L/Q= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 961749b5-acea-46fc-6db8-08dd3bc58a23 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5658.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2025 15:49:37.0412 (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: vZx9cWUPKvl22Y6eeH8Lty1VmYn71RuJJWpMz8dWEdB7Iq9mXheSMfq2uyMLdmPLkuBJkA2xtHzQX8EanT2StpWbMIa0xEAtyIe/E1gA9/E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5255 X-Authority-Analysis: v=2.4 cv=b/xI4sGx c=1 sm=1 tr=0 ts=67926513 cx=c_pps a=VzeH2YOhhDlPZ0WtbyP6yA==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=VdSt8ZQiCzkA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=6Vxr1PFL7nVDcE-punIA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 0FcaIJJOZI2ufrZKJo1HBBbZwUbqaGYg X-Proofpoint-ORIG-GUID: 0FcaIJJOZI2ufrZKJo1HBBbZwUbqaGYg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-23_06,2025-01-23_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 impostorscore=0 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2501230117 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 ; Thu, 23 Jan 2025 15:49:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/210198 From: Harish Sadineni The do_testsdk for lib32-core-image-sato aborts with below error: configure: error: Package requirements (gtk+-3.0) were not met: No package 'gtk+-3.0' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. This causes due to an absolute path name in 'sdk_env', which is now stripped to have only the environment name. Signed-off-by: Harish Sadineni --- meta/lib/oeqa/sdk/context.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 01c38c24e6..77e6a98f39 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -41,11 +41,13 @@ class OESDKTestContext(OETestContext): def hasTargetPackage(self, pkg, multilib=False, regex=False): if multilib: - # match multilib according to sdk_env - mls = self.td.get('MULTILIB_VARIANTS', '').split() - for ml in mls: - if ('ml'+ml) in self.sdk_env: - pkg = ml + '-' + pkg + stripped_sdk_env = os.path.basename(self.sdk_env) + if stripped_sdk_env.startswith('environment-setup-'): + # match multilib according to sdk_env + mls = self.td.get('MULTILIB_VARIANTS', '').split() + for ml in mls: + if ('ml'+ml) in stripped_sdk_env: + pkg = ml + '-' + pkg return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex) class OESDKTestContextExecutor(OETestContextExecutor):