From patchwork Sat Feb 8 14:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56906 X-Patchwork-Delegate: steve@sakoman.com 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 95586C02198 for ; Sat, 8 Feb 2025 14:05:12 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.9237.1739023507042311452 for ; Sat, 08 Feb 2025 06:05:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=UBGZeG1P; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fa2eb7eb45so2117868a91.1 for ; Sat, 08 Feb 2025 06:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023506; x=1739628306; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+toJ5Xe6dLM3aSRZ/Rvi72JrtIHYVdw/oeCoxiMsjrc=; b=UBGZeG1PjeKsMpPZRUxDZBwjDkriX7Pt+u9y0jRygfDgvfMwQUITYVZXF+hvUkmvD2 mLAJKWYZJj+jziXHo8apC8zr3ZpjJ0U1I8xYALhheXZFtgklVcI9SNlpUJoVa3DjnOfN kXk744QyQtA85+xnVKB5Ir+SHVdnlB0qm6jKvQ5jT7iNAlPHpzSVYswa40zZJS0N5gH9 8bW7MdC2zxsDu9xccURmBh0opn9r9KZi9QRnydIyA5C8xd/59BvXkzhiHdqgqxoRf7YS F8nVQiSc6QBcxYIXMVGVvCu+1SisIaniZjgCSP4rKhbh4SplUP08ogGXryNISQBBUAEL L3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023506; x=1739628306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+toJ5Xe6dLM3aSRZ/Rvi72JrtIHYVdw/oeCoxiMsjrc=; b=rXawSV2XhWZAOlvK/wFOWMVYo6ms9F+z5uV4AF/KmTM4Gjxq7WT5G4Sjf3SNPdIbrN 0p8VABOXLeZV9+lEnD+f2gPBeawSVMVpaIZft6c0oDWEVsaKHEPzYWAol30QOz+iqpJa J4r0vYYjwRLiqAeLpObboqEGnnyIxX/sxUQjeywA4C+VWJMF2MxAQwWbA1vICW5R0Fe/ OsiFfhoH6RiErp1yG6JbZBIXZt5S2Io3JLYgMBDthgylDYbadEmwZ2FE8NU258Xq3k4M pOo/8oCaBi4IupvsR4Msj1B94BtIIl425Blq5a7hPorKWbQxm+vXmvMIgu27W/cP7R5Z iQOA== X-Gm-Message-State: AOJu0YwwShx8+d9vtvTyl85sVNpBCMIgYrghWlBWiRxou/aaOKepXMBQ hqautPe8X5WbAPgvD35bDgHl/BInayix4c5t0rUM31+s+PuGDU8IblR3ZMg+k3TXfaKwhiIYPn9 Q X-Gm-Gg: ASbGncuIXWkroiqateDap4kWQ9ibi1OQV3Ru/T07dpMb9xmst7opfMWQXInXfTDjvoT BYxj/TbexVWqg2pk2F0BIKaPTAhtuvbpvwUqN+cTGHuAzkmqnUb3KE+HAce8+ucCtB9fTZClsqj 8XbFLv0qyr29NeX32EcnalHrHpRWT/eXhuTdXb1ns0KdXaWceaMlZXU2twUzwtIoELo62bX6uTz H1bB5E3KkvWOLyw7/C2khxa01EWISR5K14ff4Z+hkrMK9vh8O+2BZY4eCddS6FBJDpHwUjHgppz epC3 X-Google-Smtp-Source: AGHT+IHz4JziuHcgVnaUI6eSAOQlH5PgM+m7pDzc5iMtP9xJZdKa8e2pUZJ2Q35uG7oO3VIS9HQbXA== X-Received: by 2002:a17:90b:4a52:b0:2ee:d9d4:64a8 with SMTP id 98e67ed59e1d1-2f9fea60ae9mr19597644a91.0.1739023506199; Sat, 08 Feb 2025 06:05:06 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/13] binutils: stable 2.42 branch update Date: Sat, 8 Feb 2025 06:04:48 -0800 Message-ID: <6ce232df15834cae44f3eda0f786132086afb76e.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211021 From: Deepesh Varatharajan Below commits on binutils-2.42 stable branch are updated. 758a2290dbd PR32387 ppc64 TLS optimization bug with -fno-plt code ed489bf1574 s390: Add arch15 Concurrent-Functions Facility insns 64e8e16a906 s390: Add arch15 instruction names Tested on qemux86_64. There were no additional PASS or FAIL after the update Signed-off-by: Deepesh Varatharajan Signed-off-by: Steve Sakoman --- meta/recipes-devtools/binutils/binutils-2.42.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc index 41ed39632d..3784d26f48 100644 --- a/meta/recipes-devtools/binutils/binutils-2.42.inc +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc @@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" -SRCREV ?= "09ba78f051319e8f8861b26fb9340e21ca973c70" +SRCREV ?= "758a2290dbdf0d6d6c148c6cf25b2bcfd7a5b84f" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" SRC_URI = "\ ${BINUTILS_GIT_URI} \ From patchwork Sat Feb 8 14:04:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56905 X-Patchwork-Delegate: steve@sakoman.com 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 7EE45C021A1 for ; Sat, 8 Feb 2025 14:05:12 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.9239.1739023508438267579 for ; Sat, 08 Feb 2025 06:05:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=RaoofFSI; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f42992f608so4554409a91.0 for ; Sat, 08 Feb 2025 06:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023508; x=1739628308; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+YGpttadJm9iXtlyJ03HL56qhcGXRy85sQ1vUaAGLPk=; b=RaoofFSIGeImryziANEKCzLX3dpviI5dR4dlNbWo0RS8gYt/4+WUkZ0EfRoJcmMmGE AMjObAuS9cL6TWhenlOV1Wa+/bQOx1VDswR2Z0BE0gFMoCU5xenHkwruDGf2eawMPLJX tK1yFUey0G206EzKrA+SyZsv1vtNsOhShVmUDZ1IcIO73PIjGBYYUxfblHaUSVxDzA/1 1go0DDGWJY+AorTqchgURvvrQNdnYm5g96MCijIyCNY2sy/DAEHs3ElrWEQss00caU1z EVxHlLuI64McyZi/xy2jRKfFbAHidNjKGO/jVGzx0MclTC+2jdFVX0By+Y9PGsiixZXb oNjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023508; x=1739628308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+YGpttadJm9iXtlyJ03HL56qhcGXRy85sQ1vUaAGLPk=; b=HuD0XKqrRd/XuF4ECwpJu4rXhrV7r6qVvGADAEdeGzS5LAncgwaXNq54DJEOY30Rup puLHj+95zzcrcpBL5WQjSDyPuqXGX8Vo7+KQtDOTnfU9F0tTOEmKhh2Fdeq0aTnuiUni Nu3GhgJM7NvNYsTUragNXtrrUPu2WwFR3qvyM3cjULEaAoP2P3RB1WGEDgpTzsyuLeKp wYT+OjTjK4bVX1euR7JHCGdwCXItHriWqtE+9xr+1eI36kFTodLVyVz0ZyUE5dCCptIH B2imA2sJDc/C9qqYehdsc3P2XeWNoNn87/8xNox9dfUI6U+KVz4u5g7i/RTHGp6Ngqen wK/Q== X-Gm-Message-State: AOJu0YwYRJyHD8RbS3fhFlZLdiXZrLBglASH+1U5yRPSRHY2XT1d+V4/ KjSGdkSQzaZR9TRAwXyD9Z1BMQk5/MuzBrY1zV48DeD5SEf8ebTnyWN/S2etFNuvdOjcI90kLHx P X-Gm-Gg: ASbGnctrBc4oylcdzCDnPzHPPJQNN1bV0yVSG16mGbRsSUC0THKWarNA+ePMb/4BnNI COyvKhCg8W6g4GXDfZV/0Kv0Xza1IpPMenWqJK8ndBoXCWe+YOsT8xN7r5Naq5WfAWYbAs4Lft3 5sFIXbm9O3KaHKpQdZIhHnr0fech2r9sqeIhFvnR/dE91EyFmpGOj1BmQPtdl2136KRPL/gEH94 3sn29txYAw3r/4Mv7zkg67giO88JJO0+qgFDCEJG/xjOUaffI8wLDRY1afECtkAMy97W2r4/mWw C8GW X-Google-Smtp-Source: AGHT+IGtc9Zb+RcA94R8saJimZ7IEWM+3S+jUrm08Hh8zus3HfnhuVwOGT0br4l5arVbTC9/BKqNtg== X-Received: by 2002:a17:90b:510e:b0:2ee:d186:fe48 with SMTP id 98e67ed59e1d1-2fa242d93ccmr9801709a91.28.1739023507555; Sat, 08 Feb 2025 06:05:07 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/13] glibc: stable 2.39 branch updates Date: Sat, 8 Feb 2025 06:04:49 -0800 Message-ID: <54181d6ca63a720dcebb241892e76e9cdd75260c.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211022 From: Peter Marko Solves CVE-2025-0395 git log: 662516aca8 stdlib: Test using setenv with updated environ [BZ #32588] 1432850ad8 malloc: obscure calloc use in tst-calloc c1f7bfbe08 Hide all malloc functions from compiler [BZ #32366] 808a84a8b8 Fix underallocation of abort_msg_s struct (CVE-2025-0395) 994b129a35 x86/string: Fixup alignment of main loop in str{n}cmp-evex [BZ #32212] 61daaa7639 x86: Improve large memset perf with non-temporal stores [RHEL-29312] 2c8a7f14fa x86: Avoid integer truncation with large cache sizes (bug 32470) 2c882bf9c1 math: Exclude internal math symbols for tests [BZ #32414] 51da74a97e malloc: add indirection for malloc(-like) functions in tests [BZ #32366] aa8768999e Pass -nostdlib -nostartfiles together with -r [BZ #31753] 350db28393 nptl: initialize cpu_id_start prior to rseq registration 9a0e174a39 nptl: initialize rseq area prior to registration test results: Before After Diff FAIL 208 210 +2 PASS 4906 4905 -1 UNSUPPORTED 230 230 0 XFAIL 16 16 0 XPASS 4 4 0 failed test changes: - nptl/tst-mutexpi8-static - stdlib/tst-qsort4 + malloc/tst-dynarray-fail-mem + malloc/tst-malloc_info + malloc/tst-malloc_info-malloc-check + malloc/tst-malloc_info-malloc-hugetlb2 Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-version.inc | 2 +- meta/recipes-core/glibc/glibc_2.39.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index b3b21bd07d..da9227ccca 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.39/master" PV = "2.39+git" -SRCREV_glibc ?= "dcaf51b41e259387602774829c45222d0507f90a" +SRCREV_glibc ?= "662516aca8b6bf6aa6555f471055d5eb512b1ddc" SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb index 2484ae1cd9..8373db2c4f 100644 --- a/meta/recipes-core/glibc/glibc_2.39.bb +++ b/meta/recipes-core/glibc/glibc_2.39.bb @@ -17,7 +17,7 @@ Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, m easier access for another. 'ASLR bypass itself is not a vulnerability.'" CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" -CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602" +CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 CVE-2025-0395" CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" DEPENDS += "gperf-native bison-native" From patchwork Sat Feb 8 14:04:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56904 X-Patchwork-Delegate: steve@sakoman.com 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 7EE88C021A2 for ; Sat, 8 Feb 2025 14:05:12 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.9241.1739023509754645912 for ; Sat, 08 Feb 2025 06:05:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=htcXzjnE; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21f48ebaadfso43920635ad.2 for ; Sat, 08 Feb 2025 06:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023509; x=1739628309; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cV9sVvlP//TJ2tNpteE60GQv2FaCt2cOfFhFPidujvg=; b=htcXzjnEO29+s1+f6nRYAcNTo7xOF1/Nqmcaw1UbGehaDwBpNTmk8NUNGJtlZs4QKb Nigh53uzRRyMq3mKRlZm0kRPdip3CvBWG9xxQ0Ksj0rYPXqoVSALd7v9d18DjFGvkbDo 99TM4ZJ+1Opti8Ybw0dtDbpXnSW6zSEJB/3Vo32CgKuw+PQgzuC/cpFO7YvlFRCJ0Mfz XvLr7WY//T+O5ufsvEKz3Dk3McBm7ganztxmIfl0hqSgOpEpVbA4IWSnVQ2YrkVlxwCx oeM2OasfkEx76HPXXE2xp6u4Ja66qnOCOWGUN03Xz1pZl1vh7iagojqf71YJI2WEFL3m f29w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023509; x=1739628309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cV9sVvlP//TJ2tNpteE60GQv2FaCt2cOfFhFPidujvg=; b=vK3fLM5tUPW2H2qWiuIGFIkEsN3UJxTORp0PblZ8X4Dgu4uj3KCH17E1AUoJUVvtIp rt7+p8jRgpV63IBNJpN11mF0CbdaJd6XXyrG3wYV1Y0flZj65Qm66hba2rz8mQLReR/M j+YnXNURZUtcsZwsJJV9BaouVENKRdCygN8HU5oONqIzQM3T+Aw5/DIkUHtY0tENuCOQ lNF0rLEpN3MOJRrowQE/y976GZsu81xfTRscyMzHtS4Fkv0PsrFqbvk4EO7Qtvs5tDcz NflutaxqLENRcmxUjVY6kbTe9/TQWGo/401RAeBLeNt2qDeWz26tbPllJqmAnycGoh3h SMkg== X-Gm-Message-State: AOJu0Yz5JU8AOdgmvAXMegP8NUlq8GpvVo3TEf/Jsf5rW/il83JGNEEs xZ+zSC9XLeWy9p8K/qhwjXBtz8FQFIQ9J3vovaeLswTnS4eltxDpRBPjCIRaxi/O89GdnCCNUe9 c X-Gm-Gg: ASbGncuwyHq8SDTAS8nB3DpO/uiJibIbTaYzUTOkJb0ROnXn9rFGe7+wdx47uFUGmhd D5+UR5G/BKhTdGs51CXB4KiIEMmTjnZzo713uv1I2qDHjBaWpgUPMlxwpT9EfqvXLxzBTo/9OS2 PbW+6l3t15rIGEPFL0eE0T5l4uhg1RmspbVT7rzkc4qR9HiUy42SZQSkdAwdJLSdFO1YmxJPt2/ p2jNq4FE2HlGG2EaJGH6IlxHZlT4yASsUJ1wD2lKXQMcEogruCEtQFXw4AupxOydoDIpd8DnXD4 JE/c X-Google-Smtp-Source: AGHT+IEOUmv/2UcjonjyK/0ANVHdMoUVUZj9G+xcwx5/wnejPPRIOsZBzQ3Ouiip3EjpnULL/LtzCw== X-Received: by 2002:a17:903:28e:b0:21f:6435:8e19 with SMTP id d9443c01a7336-21f64359145mr63262725ad.50.1739023508920; Sat, 08 Feb 2025 06:05:08 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/13] gnupg: upgrade 2.4.4 -> 2.4.5 Date: Sat, 8 Feb 2025 06:04:50 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211023 From: Wang Mingyu Changelog: ========== * gpg,gpgv: New option --assert-pubkey-algo. * gpg: Emit status lines for errors in the compression layer. * gpg: Fix invocation with --trusted-keys and --no-options. * gpgsm: Allow for a longer salt in PKCS#12 files. * gpgtar: Make --status-fd=2 work on Windows. * scd: Support for the ACR-122U NFC reader. * scd: Suport D-TRUST ECC cards. * scd: Allow auto detaching of kernel drivers; can be disabled with the new compatibility-flag ccid-no-auto-detach. * scd: Allow setting a PIN length of 6 also with a reset code for openpgp cards. * agent: Allow GET_PASSPHRASE in restricted mode. * dirmngr: Trust system's root CAs for checking CRL issuers. * dirmngr: Fix regression in 2.4.4 in fetching keys via hkps. * gpg-wks-client: Make option --mirror work properly w/o specifying domains. * g13,gpg-wks-client: Allow command style options as in "g13 mount foo". * Allow tilde expansion for the foo-program options. * Make the getswdb.sh tool usable outside the GnuPG tree. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-support/gnupg/{gnupg_2.4.4.bb => gnupg_2.4.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/gnupg/{gnupg_2.4.4.bb => gnupg_2.4.5.bb} (97%) diff --git a/meta/recipes-support/gnupg/gnupg_2.4.4.bb b/meta/recipes-support/gnupg/gnupg_2.4.5.bb similarity index 97% rename from meta/recipes-support/gnupg/gnupg_2.4.4.bb rename to meta/recipes-support/gnupg/gnupg_2.4.5.bb index ec75960235..97b5d8856c 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.4.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.5.bb @@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6" +SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ From patchwork Sat Feb 8 14:04:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56902 X-Patchwork-Delegate: steve@sakoman.com 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 6E467C0219E for ; Sat, 8 Feb 2025 14:05:12 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.9206.1739023510989354494 for ; Sat, 08 Feb 2025 06:05:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=L0qoAWjX; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f4a4fbb35so34559285ad.0 for ; Sat, 08 Feb 2025 06:05:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023510; x=1739628310; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mnhBY+9CB2cjPUSISdliYnoTo/IFA5kn6PLiCJ9KHl0=; b=L0qoAWjX7Hyc1HF70DRtHAdvmgm5c75OvKqXfcknirETeZaksOLYIVrna2qVeQw4Gr qzBoTS2voVKRtjoxIFggAyUjs5tkMJV1Hf8D9hXktEnbq9Y32lvaHF3G8XLJSJvKI/9a IEacjK8pHZJYvv69/UjDNnQwEBXMnHjMtEbnQXp4iD61dy8BEdzXryFORQ+N0TkrFNhH L7l5zzILMLBSOeNJBqkGepjEldxHz0J6LhwZeR6aAaDFPPiifl7a8bLn4cE/29Ucf2KQ u42YUjOAj5k/eDX6Qzb2IV8S5M50AZp3sRGLr6/Y83184ihjXKG/+bC/QToPAl3fjpYd rggA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023510; x=1739628310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mnhBY+9CB2cjPUSISdliYnoTo/IFA5kn6PLiCJ9KHl0=; b=pEss5R+C7FTCaT3ZhQsE5evcSYq6x05aUqaD3k1lersyqOhFGSdI8IO90GHS+BrLXY WQTWv2spRCoFV/7XQxENt6+SkT7p93LQLVTbeY4DwPILax7uYP3tBC90qoFZzzWY/Tgt 605fL8W8pBDXVAOA6/d5Ihb9AR8EMP908NTOKJq9PDWWppg7PnPie/a7jRUuiZNXwqGu NTr5FZmLdo3L54o5cUUwuW5YgtLcaI+5J3o3Uvl6QIwrNYoofi1F/4+8IlYWjtazuqMB +JlDSBeu3FQzDHziCxSiUy5ryalxLI7g6f/ZIwTJfSMZDoDXEP4im9Co/8RV81UafIos yb+Q== X-Gm-Message-State: AOJu0YzDX/IgvVIaxnyXWd+1GwfheUybxbjdiXUBncmx9O1VJhEl3Nw3 /TLzInBocsnQIsi4NrRqcc/lRelI1PUWb4rmQDCsT0IIbo16sSYOIlrBFz0BK/3QchhIsVOtQWc 1 X-Gm-Gg: ASbGncsl8G9eFnad7eW5OiGzRPo9WjULBX/FnHfnY2IZXdunHhj0s6G96nKL+26N1ZS fUbrsQ7RWIO+gYyzR3pjQoSe1zI2tOGC2WDWZ+3Db9bk19I9OBQsGNJ1JMcupyYON2MYOwBOs56 xyIFoJ77LJNVmhjMXcztqW4CjpWgAJhPm7MfyGrG4CCoUMy0bVxvc8sQuMe8zD6vZegy1s63ePj 3O8FXXI/wxA8UffBxjS9Gz7utpmEkhf0+pSXy7Jn+Evr1WtmfVnLES/EAirXU+okicJykfhQ0ET Ochb X-Google-Smtp-Source: AGHT+IFK8aExQEV0gI0fRzcQ+pKr+6DagtGYK5xEBc6igjxZwKxK73R6yENBTNKV9k0gFsNxk4+PaA== X-Received: by 2002:a17:903:32cd:b0:215:3998:189f with SMTP id d9443c01a7336-21f4f11e100mr99897125ad.6.1739023510242; Sat, 08 Feb 2025 06:05:10 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/13] files: Amend overlayfs unit descriptions with path information Date: Sat, 8 Feb 2025 06:04:51 -0800 Message-ID: <9eb6c41e1c5411193a19e73af81f628171b01407.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211024 From: Esben Haabendal Having something like Starting Overlayfs directories setup /home... Starting Overlayfs directories setup /root... Finished Overlayfs directories setup /home. Finished Overlayfs directories setup /root. Mounting Overlayfs mount unit /home... Mounting Overlayfs mount unit /root... Mounted Overlayfs mount unit /root. Mounted Overlayfs mount unit /home. is much more informative than Starting Overlayfs directories setup... Starting Overlayfs directories setup... Finished Overlayfs directories setup. Finished Overlayfs directories setup. Mounting Overlayfs mount unit... Mounting Overlayfs mount unit... Mounted Overlayfs mount unit. Mounted Overlayfs mount unit. Especially as the number of overlayfs mount units increase. Signed-off-by: Esben Haabendal Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 7308b4fc6f51bdf2b8f3b7899ff3758c5968e418) Signed-off-by: Steve Sakoman --- meta/files/overlayfs-create-dirs.service.in | 2 +- meta/files/overlayfs-unit.mount.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/files/overlayfs-create-dirs.service.in b/meta/files/overlayfs-create-dirs.service.in index c949a6dc73..d8d916365a 100644 --- a/meta/files/overlayfs-create-dirs.service.in +++ b/meta/files/overlayfs-create-dirs.service.in @@ -1,5 +1,5 @@ [Unit] -Description=Overlayfs directories setup +Description=Overlayfs directories setup {LOWERDIR} Requires={DATA_MOUNT_UNIT} After={DATA_MOUNT_UNIT} DefaultDependencies=no diff --git a/meta/files/overlayfs-unit.mount.in b/meta/files/overlayfs-unit.mount.in index 1d33b7e39c..9c117f2c52 100644 --- a/meta/files/overlayfs-unit.mount.in +++ b/meta/files/overlayfs-unit.mount.in @@ -1,5 +1,5 @@ [Unit] -Description=Overlayfs mount unit +Description=Overlayfs mount unit {LOWERDIR} Requires={CREATE_DIRS_SERVICE} After={CREATE_DIRS_SERVICE} From patchwork Sat Feb 8 14:04:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56903 X-Patchwork-Delegate: steve@sakoman.com 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 70679C021A0 for ; Sat, 8 Feb 2025 14:05:12 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.9208.1739023512143595006 for ; Sat, 08 Feb 2025 06:05:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=UqIqRJUb; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21f50895565so23709985ad.2 for ; Sat, 08 Feb 2025 06:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023511; x=1739628311; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7ZVmySLUee9A2kPT3zsH5BdRUfe8ApE56vNhVZP/XN4=; b=UqIqRJUbsK++bnVVkUc8CHdlNYzSVBeyczQaewVWY9jEGPxVjNK0rBBaOhE14DpB9H TFvnIB2YSlQU2LjmbEQ5RbOqI9FIzNXve3Z8EgcsaJPNAUCKadlbyXwmgcCkK2DHR0sx BzgAQ10kef43v9MXFYIcELXIBmR4VZ/jWWM8eVpSRM2x2HapvdJFfTTOVbF9tc+6vjeK PhKT1yCcQQ5ecKsK+L50kRoWvTszTKA2aKseNEGVqMPJKA3/ALbejyjqDqGA14g7piuW imHCvlygr+k9z8qqPBZkzQn1lYpX2ky3oFIB08aLtVMNpHoRo5fxPYp/f441FTGncK1/ MN5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023511; x=1739628311; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ZVmySLUee9A2kPT3zsH5BdRUfe8ApE56vNhVZP/XN4=; b=KzUGWo5JY9U+0dr3cLeh4TDTEQeo62ZJ592517s9g7qEPRITTcFP6Z2NehuZEYvaQ2 I8DyYIewWrqtxNhNRueLTYswq/5eXdJbbBGID6SNZANkuf8XrpDUWpv/OmIWQOSkmchF 1VyVUziYjf+F6TKRFiaZrE+PbKhSz/QKG7zpmLwruo0epyHAtSwjooifk2iaOsw0VYPF rnvBM9ytDO9H4bY25Rdpy3smyk4ZKshkP6/MICgmHsXD15k8teXaHbx6mKArvBVypqvy HXP2sYrdKeH8wwjtAqoK9CxLqRpVYLA3nr6RMEx8EE77+oMktShGCd4LsUa8zxH+V7N/ wu9w== X-Gm-Message-State: AOJu0YxH4I0/2qSDAvmuwFhRPmF2KQTZYgciMf683qz/pUlH1h9J+X5G 7p3o8GqSNqzpOMgyuvYaElSuTti0LMUkUjnrrixnpJOXXBNSliAeR7QkzTCprr7jXjFr/vU6oD8 q X-Gm-Gg: ASbGncuiOVEl74m2du/E7dzbzTlRRpP8SvziIOiEtRbikO2HiHU+S3BhxLNV/uedu7o G14Jwr+ohphDkIj5VGr+ROlOk+BksouO+xyopLzW730LEXwVtGGaU4DO8mjtPWI4amQIVrcM06q qTsTBFgqHj/A1lWpsbDMvvCYZ76Mf9LFCNl5d0972JjFcvXLmf+7LqmnHDNT2qp/g2aEOV5hNUT BUgYtF6pzklZwX6bx/J98+d3UiZ0tjenkPxPiWspCLoy5dNhCFtXnpp7ML4VIt262NQWrlHj6cS 2CDa X-Google-Smtp-Source: AGHT+IF12OnH+ddMHqR9Qq05yMi9N/xjkADxQFvFzGd/01CQW193/twEIT3wCbn5AnUpGhQseQmcOg== X-Received: by 2002:a17:902:e143:b0:216:50fb:5dfc with SMTP id d9443c01a7336-21f4e1cc2c1mr75049145ad.9.1739023511502; Sat, 08 Feb 2025 06:05:11 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/13] files: overlayfs-create-dirs: Improve mount unit dependency Date: Sat, 8 Feb 2025 06:04:52 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211025 From: Esben Haabendal The RequiresMountsFor configuration option of systemd.unit (added in systemd version 201) not only adds the Requires and After options for the required mount unit, but it adds them for all mount units required to access the specified path. So this change is both a simplification, and an improvement. Not only will all needed mount units be added to Requires and After, but the overlay path does not have to be a mountpoint, but can be at any directory level beneath a mountpoint. Signed-off-by: Esben Haabendal Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton (cherry picked from commit fa2422232a143b21aeea3728abca82100946dbc4) Signed-off-by: Steve Sakoman --- meta/files/overlayfs-create-dirs.service.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/files/overlayfs-create-dirs.service.in b/meta/files/overlayfs-create-dirs.service.in index d8d916365a..c8431548d7 100644 --- a/meta/files/overlayfs-create-dirs.service.in +++ b/meta/files/overlayfs-create-dirs.service.in @@ -1,7 +1,6 @@ [Unit] Description=Overlayfs directories setup {LOWERDIR} -Requires={DATA_MOUNT_UNIT} -After={DATA_MOUNT_UNIT} +RequiresMountsFor={DATA_MOUNT_POINT} DefaultDependencies=no [Service] From patchwork Sat Feb 8 14:04:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56909 X-Patchwork-Delegate: steve@sakoman.com 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 88F45C0219E for ; Sat, 8 Feb 2025 14:05:22 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.9244.1739023513807402402 for ; Sat, 08 Feb 2025 06:05:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=F5QKhpJ/; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21f53ad05a0so25452915ad.3 for ; Sat, 08 Feb 2025 06:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023513; x=1739628313; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0nUbjzO+uibPSou0iM5ZF18jQduMZM+NjO/jWqvtLWI=; b=F5QKhpJ/PlqNDF4/SlRpYsDt0OX+OvLIXgB6Seuj6D9cnJ0t4GVVgyyocO8yi1BX9z 70EV0mcyeefbgliWpLvjzWwgBYcEOk+UHzTb33duTni81kaQthL2A/Varle9mFhk24MJ BWygXFeFj9cynwLDT79c11snY6uAvsrm8ZPthoudocVwVD8Me8YHptXq/oRHBNif9XGp gWxyv3LoVUORyKmoN2tja5dTw3DwJpWV31GKuIkz8RZfJ6gvxAws+IZm+Td4azHfOLWX 9sYbHVRz8+N0OxGrWtHQkpdqaZC3gXnf4Hw1rpmZJoRoJCSxA1xoqVm3AGgqNFc8ubsI 7XAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023513; x=1739628313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0nUbjzO+uibPSou0iM5ZF18jQduMZM+NjO/jWqvtLWI=; b=Xoo561o5inJ9NqsUEyfipAGxidnKqInw0fJrLCLuRgtkMPwZNoI+LG2F9/qQ40a30k MULTLPg/5+enoNBXmrNWXEEDDH0P2YST1DN2VLTV0eLYK4cIMIQpATeKfunjIOFFP2JR miUjIULLFnco/kAwVcTfemHjMfK/JxUZvAjSFIchEPe64+Z+d3jKYI/SwmV2QjDLiDFC GHX+iCT4DAKcD6jDbX+PGbpS8i8Kg5LcBj9eiWla703CUe8B98/hMZ+k4PD4tkdftMI8 Ru3PNoK4ZAFbDuAbusMdsdNq0xFC8xmen4GRZcKCo+OyggLW7ub01ZJbmdi8MWJhfd02 arXg== X-Gm-Message-State: AOJu0YzTRpDSzShWx4Z1BYS9dF0NcaEGRkR34ncVTqnApddXp9llTs4V QLUFLWLomVoQZuWqBnYZ0NQDUYIx0e+x1RUO1GeIDuh37KHzKoqswftEsEzNZqkMJ+Kxsic5wJ5 u X-Gm-Gg: ASbGncu6jQ0z+cjetSi7XPKeD7m+Ww6LinSGSuG52ZP555dA/QX9x8G9o5vCmMBl2mC epECnbQnT0SgxIxqmz5GGDcj9e8Z8UtsA4TWzIU41oJX8NyPWE1+VPc6XFZPkffdDlxPlsDm64o E5EvJf21NUlKWj0creRxbNTEOv/QwX3+BKPP7/9xVOOFdz8AAa904rfOJ6/JbsLWv2kxJ1nKoS5 8a9Doq0vRCVYcORJxSeRxRsdPQ/kGXdMTg0XF8AnW719fJyvlJ9ghojyAWXD7NaxKU5QsEXg9Yg eZCy X-Google-Smtp-Source: AGHT+IF7r73T4oEC3xkTrFMR0FbQr9icZZRbyOby22QMHB3Zdsd9pnc4OhAWNMYdb0lsaPQQtVPDNA== X-Received: by 2002:a17:903:13c6:b0:21a:8300:b9ce with SMTP id d9443c01a7336-21f4e7772e2mr127868565ad.49.1739023512841; Sat, 08 Feb 2025 06:05:12 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/13] binutils: File name too long causing failure to open temporary head file in dlltool Date: Sat, 8 Feb 2025 06:04:53 -0800 Message-ID: <617df4ee1d6523ded43f156af8206dfca2c0c8ee.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211026 From: Jiaying Song During the execution of the command: i686-w64-mingw32-dlltool --input-def $def_filepath --output-delaylib $filepath --dllname qemu.exe An error occurred: i686-w64-mingw32-dlltool: failed to open temporary head file: ..._w64_mingw32_nativesdk_qemu_8_2_2_build_plugins_libqemu_plugin_api_a_h.s Due to the path length exceeding the Linux system's file name length limit (NAME_MAX=255), the temporary file name generated by the i686-w64-mingw32-dlltool command becomes too long to open. To address this, a new temporary file name prefix is generated using tmp_prefix = prefix_encode ("d", getpid()), ensuring that the file name does not exceed the system's length limit. Allow for "snnnnn.o" suffix when testing against NAME_MAX, and tidy TMP_STUB handling by overwriting a prior nnnnn.o string rather than copying the entire name. Signed-off-by: Jiaying Song Signed-off-by: Steve Sakoman --- .../binutils/binutils-2.42.inc | 1 + .../0017-dlltool-file-name-too-long.patch | 208 ++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0017-dlltool-file-name-too-long.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc index 3784d26f48..8bccf8c56a 100644 --- a/meta/recipes-devtools/binutils/binutils-2.42.inc +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc @@ -37,5 +37,6 @@ SRC_URI = "\ file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ file://0015-gprofng-change-use-of-bignum-to-bigint.patch \ file://0016-CVE-2024-53589.patch \ + file://0017-dlltool-file-name-too-long.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/0017-dlltool-file-name-too-long.patch b/meta/recipes-devtools/binutils/binutils/0017-dlltool-file-name-too-long.patch new file mode 100644 index 0000000000..2b759c1ee8 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0017-dlltool-file-name-too-long.patch @@ -0,0 +1,208 @@ +From d95d8395b3a533461f46e8b7e55fef540fc2621b Mon Sep 17 00:00:00 2001 +From: Jiaying Song +Date: Tue, 13 Aug 2024 10:31:21 +0800 +Subject: [PATCH] dlltool: file name too long + +During the execution of the command: i686-w64-mingw32-dlltool +--input-def $def_filepath --output-delaylib $filepath --dllname qemu.exe +An error occurred: +i686-w64-mingw32-dlltool: failed to open temporary head file: ..._w64_mingw32_nativesdk_qemu_8_2_2_build_plugins_libqemu_plugin_api_a_h.s + +Due to the path length exceeding the Linux system's file name length +limit (NAME_MAX=255), the temporary file name generated by the +i686-w64-mingw32-dlltool command becomes too long to open. To address +this, a new temporary file name prefix is generated using tmp_prefix = +prefix_encode ("d", getpid()), ensuring that the file name does not +exceed the system's length limit. + +Upstream-Status: Backport +[https://github.com/bminor/binutils-gdb/commit/a253bea8995323201b016fe477280c1782688ab4] + +Signed-off-by: Jiaying Song +Reviewed-by: Alan Modra + +Allow for "snnnnn.o" suffix when testing against NAME_MAX, and tidy +TMP_STUB handling by overwriting a prior nnnnn.o string rather than +copying the entire name. + +* dlltool.c (TMP_STUB): Add "nnnnn.o" to format. +(make_one_lib_file): Localise variables. Don't copy TMP_STUB, +overwrite suffix instead. +(gen_lib_file): Similarly. +(main): Allow for max suffix when testing against NAME_MAX. + +Upstream-Status: Backport +[https://github.com/bminor/binutils-gdb/commit/d0285cdf58adf04e861cd1687f7ecec65937c99d] + +Signed-off-by: Jiaying Song +--- + binutils/dlltool.c | 64 +++++++++++++++++----------------------------- + 1 file changed, 24 insertions(+), 40 deletions(-) + +diff --git a/binutils/dlltool.c b/binutils/dlltool.c +index 066c99a4..94f6c34b 100644 +--- a/binutils/dlltool.c ++++ b/binutils/dlltool.c +@@ -498,7 +498,7 @@ char *tmp_stub_buf; + #define TMP_HEAD_O dlltmp (&tmp_head_o_buf, "%sh.o") + #define TMP_TAIL_S dlltmp (&tmp_tail_s_buf, "%st.s") + #define TMP_TAIL_O dlltmp (&tmp_tail_o_buf, "%st.o") +-#define TMP_STUB dlltmp (&tmp_stub_buf, "%ss") ++#define TMP_STUB dlltmp (&tmp_stub_buf, "%ssnnnnn.o") + + /* This bit of assembly does jmp * .... */ + static const unsigned char i386_jtab[] = +@@ -2401,26 +2401,11 @@ make_imp_label (const char *prefix, const char *name) + static bfd * + make_one_lib_file (export_type *exp, int i, int delay) + { +- bfd * abfd; +- asymbol * exp_label; +- asymbol * iname = 0; +- asymbol * iname2; +- asymbol * iname_lab; +- asymbol ** iname_lab_pp; +- asymbol ** iname_pp; +-#ifndef EXTRA +-#define EXTRA 0 +-#endif +- asymbol * ptrs[NSECS + 4 + EXTRA + 1]; +- flagword applicable; +- char * outname = xmalloc (strlen (TMP_STUB) + 10); +- int oidx = 0; +- +- +- sprintf (outname, "%s%05d.o", TMP_STUB, i); +- +- abfd = bfd_openw (outname, HOW_BFD_WRITE_TARGET); ++ char *outname = TMP_STUB; ++ size_t name_len = strlen (outname); ++ sprintf (outname + name_len - 7, "%05d.o", i); + ++ bfd *abfd = bfd_openw (outname, HOW_BFD_WRITE_TARGET); + if (!abfd) + /* xgettext:c-format */ + fatal (_("bfd_open failed open stub file: %s: %s"), +@@ -2437,9 +2422,13 @@ make_one_lib_file (export_type *exp, int i, int delay) + bfd_set_private_flags (abfd, F_INTERWORK); + #endif + +- applicable = bfd_applicable_section_flags (abfd); +- + /* First make symbols for the sections. */ ++ flagword applicable = bfd_applicable_section_flags (abfd); ++#ifndef EXTRA ++#define EXTRA 0 ++#endif ++ asymbol *ptrs[NSECS + 4 + EXTRA + 1]; ++ int oidx = 0; + for (i = 0; i < NSECS; i++) + { + sinfo *si = secdata + i; +@@ -2466,7 +2455,7 @@ make_one_lib_file (export_type *exp, int i, int delay) + + if (! exp->data) + { +- exp_label = bfd_make_empty_symbol (abfd); ++ asymbol *exp_label = bfd_make_empty_symbol (abfd); + exp_label->name = make_imp_label ("", exp->name); + exp_label->section = secdata[TEXT].sec; + exp_label->flags = BSF_GLOBAL; +@@ -2482,6 +2471,7 @@ make_one_lib_file (export_type *exp, int i, int delay) + /* Generate imp symbols with one underscore for Microsoft + compatibility, and with two underscores for backward + compatibility with old versions of cygwin. */ ++ asymbol *iname = NULL; + if (create_compat_implib) + { + iname = bfd_make_empty_symbol (abfd); +@@ -2491,25 +2481,24 @@ make_one_lib_file (export_type *exp, int i, int delay) + iname->value = 0; + } + +- iname2 = bfd_make_empty_symbol (abfd); ++ asymbol *iname2 = bfd_make_empty_symbol (abfd); + iname2->name = make_imp_label ("__imp_", exp->name); + iname2->section = secdata[IDATA5].sec; + iname2->flags = BSF_GLOBAL; + iname2->value = 0; + +- iname_lab = bfd_make_empty_symbol (abfd); +- ++ asymbol *iname_lab = bfd_make_empty_symbol (abfd); + iname_lab->name = head_label; + iname_lab->section = bfd_und_section_ptr; + iname_lab->flags = 0; + iname_lab->value = 0; + +- iname_pp = ptrs + oidx; ++ asymbol **iname_pp = ptrs + oidx; + if (create_compat_implib) + ptrs[oidx++] = iname; + ptrs[oidx++] = iname2; + +- iname_lab_pp = ptrs + oidx; ++ asymbol **iname_lab_pp = ptrs + oidx; + ptrs[oidx++] = iname_lab; + + ptrs[oidx] = 0; +@@ -3089,29 +3078,26 @@ gen_lib_file (int delay) + + if (dontdeltemps < 2) + { +- char *name; +- size_t stub_len = strlen (TMP_STUB); ++ char *name = TMP_STUB; ++ size_t name_len = strlen (name); + +- name = xmalloc (stub_len + 10); +- memcpy (name, TMP_STUB, stub_len); + for (i = 0; (exp = d_exports_lexically[i]); i++) + { + /* Don't delete non-existent stubs for PRIVATE entries. */ + if (exp->private) + continue; +- sprintf (name + stub_len, "%05d.o", i); ++ sprintf (name + name_len - 7, "%05d.o", i); + if (unlink (name) < 0) + /* xgettext:c-format */ + non_fatal (_("cannot delete %s: %s"), name, strerror (errno)); + if (ext_prefix_alias) + { +- sprintf (name + stub_len, "%05d.o", i + PREFIX_ALIAS_BASE); ++ sprintf (name + name_len - 7, "%05d.o", i + PREFIX_ALIAS_BASE); + if (unlink (name) < 0) + /* xgettext:c-format */ + non_fatal (_("cannot delete %s: %s"), name, strerror (errno)); + } + } +- free (name); + } + + inform (_("Created lib file")); +@@ -4096,9 +4082,9 @@ main (int ac, char **av) + if (tmp_prefix == NULL) + { + /* If possible use a deterministic prefix. */ +- if (imp_name || delayimp_name) ++ const char *input = imp_name ? imp_name : delayimp_name; ++ if (input && strlen (input) + sizeof ("_snnnnn.o") - 1 <= NAME_MAX) + { +- const char *input = imp_name ? imp_name : delayimp_name; + tmp_prefix = xmalloc (strlen (input) + 2); + sprintf (tmp_prefix, "%s_", input); + for (i = 0; tmp_prefix[i]; i++) +@@ -4106,9 +4092,7 @@ main (int ac, char **av) + tmp_prefix[i] = '_'; + } + else +- { +- tmp_prefix = prefix_encode ("d", getpid ()); +- } ++ tmp_prefix = prefix_encode ("d", getpid ()); + } + + mangle_defs (); +-- +2.34.1 + From patchwork Sat Feb 8 14:04:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56913 X-Patchwork-Delegate: steve@sakoman.com 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 A4818C021A2 for ; Sat, 8 Feb 2025 14:05:22 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.9245.1739023514747187180 for ; Sat, 08 Feb 2025 06:05:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hPlyddUV; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f49837d36so30366015ad.3 for ; Sat, 08 Feb 2025 06:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023514; x=1739628314; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Is2DOIXLbq40AAqymPueUL9hsroqf/63oPIaHD4rudo=; b=hPlyddUVR0Y16siWHalEwEQPNVWDAqzVy2+Lthpk5RYIZc7pGA+zqrAgCeeSj9raLR qQxYQGo+8DeEdbTMKjHUUBPby0XrfRDxvlRdUNNPq4JG60A1a8o1fR8hfI9v5kCGr3G5 ofDCzROsFDb29cueUqZzjVUeS36tUa8r3UbkLxHtreq3rNTERDOq8Q8UlopnGRsD5bim 3iwpFRk6FVDIE4pzmMoEH2JLwU/jrKw2RE2jeMxsQLUZJI9rWQCeOcFxhhlI8V3b9Heu GuNA9Dd6BuaeYaAcMhqBjg+oJf0zug1ss4+/GP7e/OScSCcraXZHKwyMAdQZ61biVKOk 1RVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023514; x=1739628314; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Is2DOIXLbq40AAqymPueUL9hsroqf/63oPIaHD4rudo=; b=D5Vj0WT9JBcuOpYzvf6LF6FBiiHQuxlXoA+AZ1xUgLLovqBTekuWCTVBuXycUOHdox HcZXarV2xJ9OnpxUVZOPWpbSdVgDmK6HZzkUr5Z7DGmVJhyUA7mREWCOS3ihDXOSg2La dPKIWByk29u2Eyrfujv1s53iBgwCOmcLqvfripbYm0jw5+PZt9btqP60Mx4c0697Imxm QWuf04MGEWyMv//5zpaRshQbVG6GFJjg//yHoJT96YBEUdEehsGXnvbiLGGqCc4/DM+l qMTRD8/OwrFBJIdusGeG0r30hAORIgDWBHKrLTqIP0NxjlyWjsuzHpRaA9HojaOO0suE lTiQ== X-Gm-Message-State: AOJu0YwABma1jr+LP5PkQDXrdNAvhB1JsR1Hq0lOysqLThUhV+gxTDFL dpTdxX3YkZm62QAwspBWa4JEyS6jvOSzJpNnfqdQRU/l6zFYUdfBR/z1QZVXiCaynSyeNWRyFAl f X-Gm-Gg: ASbGncu4UdG/lsFgdScMtnynLVbAHH+GPmMN95JJ7mUts5q/X0mJiIShi/mTkmeMgkA tdwT8xnQGKmMaCtQneK5rGHfeH8BHRpOKbCTC1J6gc0MbCtyHHjCv15fzUYb3+1rJbv58687xwK c1Y+nqCoTf9v8OXNLO6VLX24z8+tTAWb7z+2fG1SNR1sHVF1a1AuNxqZjL1a7Su6sHOAUk5bR6J jdcla4Jtpbw/zptiI23il+JionhKaS35AqQ/lcY2xdMjugc5QPPtl+48a1TJt9A72x4M6ircFaf WLSS X-Google-Smtp-Source: AGHT+IHssJqhZj5+P9MbeQnsdkdKDxL12p7Uf1KutNIyb4Hm0kti8Entnlg4ryBBuOkKTIzkktIXpg== X-Received: by 2002:a17:902:d50c:b0:21f:46b:a25 with SMTP id d9443c01a7336-21f4e6bea28mr117706365ad.16.1739023514007; Sat, 08 Feb 2025 06:05:14 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/13] pkg-config-native: pick additional search paths from $EXTRA_NATIVE_PKGCONFIG_PATH Date: Sat, 8 Feb 2025 06:04:54 -0800 Message-ID: <104737073bd553b9cf93db7ed9575fd50ba6c973.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211027 From: Alexander Kanavin This was prompted by working on librsvg update: the new meson-driven version wants to query values from .pc files residing in its own build directory, and modifies PKG_CONFIG_PATH accordingly. When using the pkg-config-native wrapper such modifications have no effect, and we have to pass them in manually from the recipe via EXTRA_NATIVE_PKGCONFIG_PATH variable. This variable is already defined (with an empty value) and appended to PKG_CONFIG_PATH export in the native class, so this simply extends its use to the wrapper. (Appending to PKG_CONFIG_PATH in the wrapper, instead of resetting it, is not an option as that can lead to contamination with the cross values). (From OE-Core rev: 2bc050146d47b14d890a1b0db2b55f9057a08b65) Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Chris Laplante Signed-off-by: Steve Sakoman --- meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in | 2 +- meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in index 9ed30a0d80..fd5ab6b1fa 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in @@ -1,6 +1,6 @@ #! /bin/sh -PKG_CONFIG_PATH="@PATH_NATIVE@" +PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@" unset PKG_CONFIG_SYSROOT_DIR pkg-config "$@" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in index a9324de4cf..d4bb4f8c06 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in @@ -1,6 +1,6 @@ #! /bin/sh -export PKG_CONFIG_PATH="@PATH_NATIVE@" +export PKG_CONFIG_PATH="$EXTRA_NATIVE_PKGCONFIG_PATH@PATH_NATIVE@" export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@" unset PKG_CONFIG_SYSROOT_DIR From patchwork Sat Feb 8 14:04:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56911 X-Patchwork-Delegate: steve@sakoman.com 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 978C7C021A3 for ; Sat, 8 Feb 2025 14:05:22 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.9247.1739023515887747423 for ; Sat, 08 Feb 2025 06:05:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=EglrgLqj; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2166651f752so67809375ad.3 for ; Sat, 08 Feb 2025 06:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023515; x=1739628315; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RZFF/KHM4rsJUiOpqAnV5ludirNYO0Brnd5Fvby+IEE=; b=EglrgLqjeVOHPNiMHTJEC3ytyWR7mscKjftvalcB/2HnbiQ5PQEhmXrcPgggQrTNfP HsmY9iJPaCHFKqflP8taOkLKXBQtfZqGsyyX1htoMBPV9YblBqWpjDXc2NRteffTvxhM dFB8HppOTuOuCL8Y8WK7TF9VsdMDmYvNiVIv0UjROelsDJO5z6W74ISCm8UsO9vBFU2U y2V+rDEslv57lWNv7qzyWhgaijR5xv95tCq80n0pYnna8hdIzdxsksugil2FYCC8hHI0 348MkkLhKZcNQzFd2v+pAl3X1SSEALnVoCaDF+J825UIWeEDmtklIr6BfiMQdzIGhYwx 91yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023515; x=1739628315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RZFF/KHM4rsJUiOpqAnV5ludirNYO0Brnd5Fvby+IEE=; b=Yd59DxMzYS5h22ZDLckP5VnbuK0iCk8olNrhYSMXRECAQISZ3oIdaKUMIqYAy6My3V lFdMoqPxwlXhd7I3qjkx7bJHQ6l9XFVYvq0lQuk3FJwEaRiRj8TP1IQVCd/fNL+/6/7h oGF4D4L9uqOCxdZ6vfr55OsaPt31ZucMrB8ITJE+M8QCZeD6hS4Z5BrkPmUg5J4+kIWA g2VYwtf+Hg3CFVZz+NtG6J4h3pttdRui+38gj3ijNulAKtriLHVlsB1P71tZYonRBeXu U2N/Uxc7Uh7AGPk6aQa4DvxBhIjdIRVuM6UhOv8qpKdLerPdbMF9W9nMM3gyPcrk5pxL oedQ== X-Gm-Message-State: AOJu0Yx8vHdJGZJWD7WG/Q51hsS4/GTvuhPA/Zokl9Pcpu4tygJTaRyD S8025YO+5qcy/BrHnggbxZaxxQMZftAwSdL0Dn1FqH2hKVHqNbGQjYidM8H7FKAGo6wRgSIq3Ik B X-Gm-Gg: ASbGncucuX33+uDpY9DmMSmhYbTHFEOKEabxqJsHX53AHHaYpMyPVXK9lVX2+wyLLwK oqStlADhM2jDJMlNSNQrPQPhYzsVV+/4xQNW2nxAPzBKBPAKmlhAMXD7aXCWdlim3Yur5tNIfSn ljPl52f/sE62WlVzem+fzuaOEZYX0t24elypt4ScT5ktvtAv4u2VOukAf59048nL9XmGFCEMFNU RfqqJYrhdwic2wb9lkPLf63D2cicpt1+F3aaaVPq7n9ikZPIiF6qib++pHtwSyw29FcmDUXAHz8 8L5C X-Google-Smtp-Source: AGHT+IE+W1NNIxlhNAV0fv/zH+YhSI+QqxenapPD3yz7sabZuhx/DgH+SBBQTdvX6hbdbSQa8FcIkQ== X-Received: by 2002:a17:903:2f84:b0:216:31aa:12fc with SMTP id d9443c01a7336-21f4e6e6123mr104503185ad.24.1739023515225; Sat, 08 Feb 2025 06:05:15 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:14 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/13] rust-common.bbclass: soft assignment for RUSTLIB path Date: Sat, 8 Feb 2025 06:04:55 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211028 From: Pedro Ferreira As a user i want to override `RUSTLIB` path on a bbclass, lets call it `XYZ.bbclass`. If a certain recipe inherits `cargo.bbclass` and `XYZ.bbclass` the value of `RUSTLIB` is dependent on the order of the inherit. If `cargo.bbclass` is inherit before `XYZ.bbclass` this will reflect the desired value of `RUSTLIB`, on the oposite, if the `XYZ.bbclass` is inherit before `cargo.bbclass` then the `RUSTLIB` defined on `rust-common.bbclass` will prevail. Changed definition of `RUSTLIB` to soft assignment to make it overridable. Signed-off-by: Pedro Silva Ferreira Signed-off-by: Mathieu Dubois-Briand (cherry picked from commit 6eeb832f73ffb48f5f05dc47191f60e4599e640f) Signed-off-by: Steve Sakoman --- meta/classes-recipe/rust-common.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass index 6940093e59..b4b70574a2 100644 --- a/meta/classes-recipe/rust-common.bbclass +++ b/meta/classes-recipe/rust-common.bbclass @@ -13,7 +13,7 @@ FILES:${PN} += "${rustlibdir}/*.so" FILES:${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta" FILES:${PN}-dbg += "${rustlibdir}/.debug" -RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}" +RUSTLIB ?= "-L ${STAGING_DIR_HOST}${rustlibdir}" RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=${TARGET_DBGSRC_DIR}" RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}" RUSTLIB_DEP ??= "libstd-rs" From patchwork Sat Feb 8 14:04:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56912 X-Patchwork-Delegate: steve@sakoman.com 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 96FB6C021A0 for ; Sat, 8 Feb 2025 14:05:22 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.9250.1739023517604026512 for ; Sat, 08 Feb 2025 06:05:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=b+iLnwL1; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21670dce0a7so70675095ad.1 for ; Sat, 08 Feb 2025 06:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023517; x=1739628317; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gP0XDbpP6++8n/NBVSMBHGgbtPgyOJhjZNvaE9JSrAA=; b=b+iLnwL1qtsZN5tZD2TxCe0HvSzUqhWdbwxOD8oNmw8yxS+lRZMuGLdxkA+yRK8mwx ozy7iy5TP2recCHXBxQEPsKb5PCn+5/rKrqhJvpccQWIrn9aeG7DRRLxDTWOqeOfnbt1 RnsTcV+9bct6ohXIdRjolFffLxWMVAvNnWd+M1Ixk3Ong89W1dLoJKmcjqrrH/GcprG3 qpjjJ5Y9sn3j+X2dbmd2kuGcw/eGvYb+m4bE3G9lH67wUyw/DrWUch8qvnoAaK6jhzig rJCkH9kzV2Zs0XvxKh9cWLohljGba62Ng2xoSNu58h4RLoebwjRdFnhK7ulzURq+eR2f SOkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023517; x=1739628317; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gP0XDbpP6++8n/NBVSMBHGgbtPgyOJhjZNvaE9JSrAA=; b=mYm5g/Beug/1Zr1QFgQqmo39koDE/KIdmUcY7Wonn9kytI4fuXeUruYxQ/KmQ1gs67 R3b1T6j597S91N/mnEl07QyagXR2G/2FF2UfpMCOfaw/Sp2j7RHRzWYcUfIcXHF5diaQ JC8LMwC4X0S+opWiEdxwwdYWwLaWOVkQ1cn19zhwWCI/F6dUEp0b608bnIcDHCcFk605 WrluPT1SbVnd6v9xCrxAEz6ZTssy2m34QEhjIx//onDmlNPMgFDbQjsqC72zQb4RJCUV CPY9nhgjFQCSz4ec4xKAMN1dso9iq3MrOwouNN/lvSrQ1lJp9nE1mfbM3uOfqsp1KfdO T9EA== X-Gm-Message-State: AOJu0YynC5ueOBnau18Jmoiq7QZp4gmX98BHmzYoMXumPfcN9wQtG/px v9KuHDOJfgszEZq2gI/sX4JS4HL8b9AwxcxXEG0zIQUOuwY2eslI5x6IsiKYTq+KsqHDBPyPw/K n X-Gm-Gg: ASbGnctKumTUXGIpB06ewhSnYHRPUD5CLGCufknL4C+Ef9iN2cJ6+pdU6f3L7BdKb+u mBF1cR5QaLsKUATRNDM9CGO/aY3IH0zptgaIoN/LXyNG4yLCC/lhzawObDDWYtAh85+x5HoeXsN hPruIcCb3/CrndqArd7bByu4RiL/4/ZYUErt/IXXX6Oznjp0VgPnHvV2pDO4M/0ANC7Rd07cvi2 zbro52WhYX68ur1QKKeGVya8vhrIaWyNol1zDl7rZNs/BuE4QLv4IPHx97fu6+ygl4O+zYIy3tw GzIN X-Google-Smtp-Source: AGHT+IFReZvfGNYIG0T+MQkPfgJngvdAHxmYDkvIZscXsKBqQeyBSCAklj3IdWbRdtqjXZvX8K0Ucg== X-Received: by 2002:a17:902:ce06:b0:20c:6399:d637 with SMTP id d9443c01a7336-21f4e78de85mr143012495ad.40.1739023516835; Sat, 08 Feb 2025 06:05:16 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/13] rust: fix for rust multilib sdk configuration Date: Sat, 8 Feb 2025 06:04:56 -0800 Message-ID: <889cda30baccd43e5c82b38752b462aef4ce626c.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211029 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. Backport from oe-core master: https://git.openembedded.org/openembedded-core/commit/?id=40eb4bfe2f100ba5301046ca25110fcc55a640bb Signed-off-by: Harish Sadineni Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rust/cargo_1.75.0.bb | 13 +++++++++++++ meta/recipes-devtools/rust/rust-cross-canadian.inc | 10 +--------- meta/recipes-devtools/rust/rust_1.75.0.bb | 12 ++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/meta/recipes-devtools/rust/cargo_1.75.0.bb b/meta/recipes-devtools/rust/cargo_1.75.0.bb index 50b7e7c7b4..a6d3f1754b 100644 --- a/meta/recipes-devtools/rust/cargo_1.75.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.75.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 8a51a02293..4e2e051f1d 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -53,15 +53,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 @@ -80,11 +77,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.75.0.bb b/meta/recipes-devtools/rust/rust_1.75.0.bb index b041a5f8e4..b9348bf050 100644 --- a/meta/recipes-devtools/rust/rust_1.75.0.bb +++ b/meta/recipes-devtools/rust/rust_1.75.0.bb @@ -270,8 +270,20 @@ rust_do_install:class-nativesdk() { rm ${D}${libdir}/rustlib/uninstall.sh rm ${D}${libdir}/rustlib/install.log rm ${D}${libdir}/rustlib/manifest* + + 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 Sat Feb 8 14:04:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56910 X-Patchwork-Delegate: steve@sakoman.com 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 8EEF3C021A1 for ; Sat, 8 Feb 2025 14:05:22 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.9253.1739023519223708626 for ; Sat, 08 Feb 2025 06:05:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=TMrFDms9; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f2cfd821eso53990595ad.3 for ; Sat, 08 Feb 2025 06:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023518; x=1739628318; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xO2OKrIZu1l/Eq8vXAiijOldCHT7nWzD2E8t64LAQhU=; b=TMrFDms9XENkq2b/2g8uqaIjDzI6O9g8pqcd2X2ugPFONem2TCLrsBktNitHvgn3LB MwYF2WN/bDK2SOoN9Yr0Ds0QLCAeGE7JESGJmxIswvc1jJhjWeq9431xOJtef1rT86Ij /1rqiukSxCXAZ2ifOXtLxRyc13gqIljmWKIeqQjuOlct7J9OPguN8wC4QkdK35fuNjzl 4Ng8ilM2lper418J/XEOeiz7P/Pii2KiNZ9IrdBqKOA41biEih+/HA9YLvXlCPrZC4A5 DmHHHOuLSb9u8plAgWmjliHXaR1q4aDE1BGfj1zEdd56AYgl7z588Jktt/NyJnkjZdAo mcNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023518; x=1739628318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xO2OKrIZu1l/Eq8vXAiijOldCHT7nWzD2E8t64LAQhU=; b=Vi8A4R5Z8C/aozdUbnR/qKX3hXex75QmZE4YnarTkB+oWGSSrau4yZtYubQpDyM66J DDAc5K8XmT3i+fgKmssdHPiv6lwa455u7nZ9rdgt9evNSgkgujtiHFXueuX7NmvYNxYS U87HiqfLWEvhhOvF2eLCS5UOFv2KLuWUaeAf3sun2rZl8KSpn1ovD/pOWI4QLvllzThh +qHLvDIfkHXLTR7kulZQ91wY5E1Ymgv6U2VyrJa0fGxbKanUQAp9PW/Nx5Twwzi1WHiN yCB9PrqyPI9Adnnf7gI2Ea3beZoLmw8xQGb+8aEkV/5iBZDs4+Zm8kFVaxSRTAQFU+CQ LCtQ== X-Gm-Message-State: AOJu0YxWj6FnG8g7EimL6sOJWUse6jndj1Btcxueig2nb8JveSBlJizO 05nZaArwYTbjyH2GA490hW5fMdZZhlirgUPgMiHXpP+Om3ZQ9OxQxOeQr0RJPW+s9LQpim4Qlcl a X-Gm-Gg: ASbGnctTz4jZXPiHoHbvFT7uVJkkplboaRnneiqavkl6/+d32OoO3CBmYdkeB3Ru/za jwRrjhHht99c4s8rddpygVRTDAySO7iEpIc3IQ3eHjjoAcVa4qcZ//djBPs3XSKQGKQd6EuIw9u yTjOmwgRUC4CATZCDD6guiOPhIjyHVEzOAvVYr4qi2q5Nb6mmG1tL6FypJQxT5I3T5Izdm3S0AR TGU094izmQn45Y8JSGwj2/fAEyJM/g/dcaqw4fIV9n6A+rY5v97P1WNghbOuY50/FVPT6/WdWyx rP4o X-Google-Smtp-Source: AGHT+IHs1KQ5CemlY88773xa1xJttv5ntHfzQqj3fOM9rxYkFgbyu+g6MUeuBCKTAprJ0AqBh3kJzw== X-Received: by 2002:a17:902:c40c:b0:21c:e34:c8c3 with SMTP id d9443c01a7336-21f4e70430emr125314435ad.24.1739023518496; Sat, 08 Feb 2025 06:05:18 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/13] rust: remove redundant cargo config file Date: Sat, 8 Feb 2025 06:04:57 -0800 Message-ID: <12fd08cf4009d0284ab951cc48a479dcbc74db42.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211030 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. Backport from oe-core master: https://git.openembedded.org/openembedded-core/commit/?id=d5f78816d2ad0f3e43ce883eef199d1683cfcbb4 Signed-off-by: Harish Sadineni Signed-off-by: Steve Sakoman --- 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 4e2e051f1d..dbf997560b 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -64,20 +64,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 Sat Feb 8 14:04:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56908 X-Patchwork-Delegate: steve@sakoman.com 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 88F11C02198 for ; Sat, 8 Feb 2025 14:05:22 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.9210.1739023520985416079 for ; Sat, 08 Feb 2025 06:05:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=P0xVAcYd; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21c2f1b610dso73818695ad.0 for ; Sat, 08 Feb 2025 06:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023520; x=1739628320; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Lz3lCphABrK8uEgEYlE4ALNbLEAjfLwc5iKkAv5oV7I=; b=P0xVAcYdAqQ1BsbWtuuY/2AU+EuAdJt9xPnin+zJsCklcPezr/ZnsHvq6NkRLgH7+a j9XzLqYztiSTcp228hhevV84oYVJW26qOrUGofnqCTSOpfCBz2oDcVDDYdrh02r3KrPP 0cKcq+D5N0AnUTrDpmJhOhNDEKZkpr07CCn9uQ5BoitsQD78GYqEbDFz0McTjpDWowXC //nMQlSs1XmZDbKBzhX3IhC7l7Ule3BO1avOvUljuAIg/58EWHGqQ4v9UyjPdRuV5FlH VstpwqCWrIAMo1XqaRzKa+FOTwrWG9zC46Qe9FWRZlFqGf5/BbA5aurtCwjIeJ2ea4zP 8+oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023520; x=1739628320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lz3lCphABrK8uEgEYlE4ALNbLEAjfLwc5iKkAv5oV7I=; b=b7Gwqcqd8iZSN6SxOqjuYmSXZlMrqWbNHxkrBcrdsA2Ver8tvoAxcLRzeIXlcJn44v fCvJP9Q3jJa0AGwehOhQrWPpHzaURX5iMSEGRUYcE63+2snUG4AsJChDJklkfAkZkjlC 4qOoJnKxPmap++b2c/jD8MH62V0X837Na54P5pdo9HfJCMFBjMOgTLZMRvXFzcaDBtEA C13w3Ja4bMzV59xjXJZBx9ZuzTLB6z58Sfroz4DKFYV/PaSRdA3JwSUkRTMRgAUJA8Ym siMIeaj982a9oy0WPSdqXQoOZ5FP4d/OG+31zi4XCErzfJ9c/VqsbTyU6iV4qPRQhvkk OrgQ== X-Gm-Message-State: AOJu0YxEX3IA1h9fD7H6qzZN/ElsxxPWQbX03gcXjRl4z0B8amBCc9S5 J1KFQ625iimJTzuhbh2iEzFuKWJGAkMuWnHNfOd9+RbRqISNzmFXVnNGBX4x+5YcmTTgP9aSv3H f X-Gm-Gg: ASbGncsW7sDuxr2SRPN4JehUOfqk97aQKaEGhPIPandj1R0YDwyjhgGqPssbfsLftJb V3mX5ZX3XYTazC/CbCyzXK4reRsA9t54gXH387yJ+naJ1O0zrxliRf73TWInrUNxpgIbuqxCrEq qlRg59S+ZsMooE37qyJMiQt7a28UrEV5aPsfUJOJCrId9dH8MhpW9QgkKGcgpVaqTVEyn7BlQkb fBD8hHFDyDbjyLshEt4kBe+ExpxV4wLtZoZHoIxdyLcBvs4+Z1VEsbDZRe09JxPj8cIFjRKTzaw 02MK X-Google-Smtp-Source: AGHT+IEY6Q9uHovtgAAHNyzSuOIAH2S8Srm2XIfdz57SGXZN04qWwwkiDigP17/siSgDGVRYnLZlNA== X-Received: by 2002:a17:902:e946:b0:21f:f3d:d533 with SMTP id d9443c01a7336-21f4e6ca8bemr118476045ad.2.1739023520219; Sat, 08 Feb 2025 06:05:20 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:19 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/13] oeqa/sdk/context: fix for gtk3 test failure during do_testsdk Date: Sat, 8 Feb 2025 06:04:58 -0800 Message-ID: <83c3e40e2361d771a724062e38a1349b87059c75.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211031 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. Backport from oe-core master: https://git.openembedded.org/openembedded-core/commit/?id=386e4132a9ced75599d92610cf5c0e8fe907c3b6 Signed-off-by: Harish Sadineni Signed-off-by: Steve Sakoman --- 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): From patchwork Sat Feb 8 14:04:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56915 X-Patchwork-Delegate: steve@sakoman.com 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 A7648C02198 for ; Sat, 8 Feb 2025 14:05:32 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web10.9212.1739023522518808742 for ; Sat, 08 Feb 2025 06:05:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=pGqkLQI+; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f48ab13d5so44054225ad.0 for ; Sat, 08 Feb 2025 06:05:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023522; x=1739628322; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kbbxrql7Iutj/myx14Cfcalewu+8I3McCY+wQyizWHk=; b=pGqkLQI+hy+dgfFANMjmfjpZAychFoz1uRrxf+4fp9VxGvIIGNyMRy0F6jgDxUv7uJ E5jNVEAHI4JwHxTZ3+nddenjxyAdSN5YzhrS2OScpcRcywtLz48ahOBH7AaY97roVikr 2yoGE1NUTKORb0SKBk+L1fM5RhV+KSIVGurONa6zAxU+TxxmUHthkSfCb68cD0f5RXd0 TmAcHpSB3Ac9Uq1P4/uhY+TfxoDyYb16NCbVTVa+gMNOQjAk1kNHZxqku6U9XDvoQYiY aglMxrTD6tO95t3bcPZcSqe8AfevRnmUGj72AaMQTL4BVd23ia0DjrP9NO18VNPXfPb4 YtQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023522; x=1739628322; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kbbxrql7Iutj/myx14Cfcalewu+8I3McCY+wQyizWHk=; b=ie5RZrZakl67LAB6EZOMzdPylDrCpjsyfACm6vMVpnxc69Fl67FSLCM6J/V4V8UhSy yvfHqG3fhoyLD6uwQUd0lfj7wCwzVFHFzVAoLjUY3e8F+FULEnN7M30wNkAfW392PGIG qGnyWDtTl+9PJlWYim8YcRMEi3cSfWmaIvDq8vkNbnrfEVmso9PT7IHDQPKFK+cDUKBs SuWxF4dVk8NaITNrDGdz9rP1pnb2mEJs66pA/9DR8aADB0YKpoSfZ5TMSDEqFq+ZtHU4 P4vAkUAPXJv1hVroqZkQLiwG550DqbR5D+k2yBe3Auy3pAL6Q+PZvp2q5oeZIKNKBI+p gtUw== X-Gm-Message-State: AOJu0YxQu81+MIGWOAF96MN3sQY8hZ0TBdgpCXD9gIwKj1TDZCtaibaf 1BzLUDJ3BS9Iv5La9HnKahfDdmfD1EVrf6G7XbLHzZ6KfhCA1QpqxZwrkXzTOY8sLY2g5RBJ7cN E X-Gm-Gg: ASbGncsSocArjpRsbkePGpRq5Wg/HDRNCR6pJG3rkFZMH6QwPilDhlOq6yBD0uGh/qy k7CMl9T/dgBhEKZxG29TQjGchUzijt2Ng5nCN2ZgYU8KqjD9Rr4JD8XW/GdfqLAOs0RW1ziabaA l6Drut75azY3t9YfnFulrK34sqGwKRTXfhgiZ/XGJ1H0fwz8NCX428LRPPXMna6D+s462HRn3EZ ObV7iKIl30ooJHjWYGe5kvoWL/fCuBP8Edjyb/FCnNeyf4c42i3ceC3301dXzBWqtpZpaCWZJn7 0E1g X-Google-Smtp-Source: AGHT+IH3fGPq4U7UVGohhRDAZH9HoqupStnxggBsipFTb2KX7B2XVOSCBdIMfXTuxHkxth8ejPI7Nw== X-Received: by 2002:a17:902:f790:b0:21f:6896:f80 with SMTP id d9443c01a7336-21f68961121mr42538235ad.9.1739023521841; Sat, 08 Feb 2025 06:05:21 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:21 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/13] oeqa/selftest/rust: skip on all MIPS platforms Date: Sat, 8 Feb 2025 06:04:59 -0800 Message-ID: <681f5ea8d6a5050aebfb1f656da9ba679433e366.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211032 From: Ross Burton As per "The rustc book"[1], mips*-unknown-linux-* are "tier 3" targets: Tier 3 targets are those which the Rust codebase has support for, but which the Rust project does not build or test automatically, so they may or may not work. We already skip qemumips in this selftest, but we're now also seeing failures with qemumips64 so refactor the test to skip all machines where the architecture is mips or mips64. [1] https://doc.rust-lang.org/nightly/rustc/platform-support.html Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 177e268811c04260923ac4b16fa047315304add0) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/rust.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/rust.py b/meta/lib/oeqa/selftest/cases/rust.py index ad14189c6d..ca98f8c0fd 100644 --- a/meta/lib/oeqa/selftest/cases/rust.py +++ b/meta/lib/oeqa/selftest/cases/rust.py @@ -3,6 +3,7 @@ import os import subprocess import time from oeqa.core.decorator import OETestTag +from oeqa.core.decorator.data import skipIfArch from oeqa.core.case import OEPTestResultTestCase from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu, Command @@ -38,15 +39,12 @@ def parse_results(filename): @OETestTag("toolchain-user") @OETestTag("runqemu") class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): + + @skipIfArch(['mips', 'mips64']) def test_rust(self, *args, **kwargs): # Disable Rust Oe-selftest #self.skipTest("The Rust Oe-selftest is disabled.") - # Skip mips32 target since it is unstable with rust tests - machine = get_bb_var('MACHINE') - if machine == "qemumips": - self.skipTest("The mips32 target is skipped for Rust Oe-selftest.") - # build remote-test-server before image build recipe = "rust" start_time = time.time() From patchwork Sat Feb 8 14:05:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 56914 X-Patchwork-Delegate: steve@sakoman.com 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 A8A20C0219E for ; Sat, 8 Feb 2025 14:05:32 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.9257.1739023523967568141 for ; Sat, 08 Feb 2025 06:05:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=iOjbSLG4; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2fa40c0bab2so1342779a91.0 for ; Sat, 08 Feb 2025 06:05:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1739023523; x=1739628323; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/dZ3JWAaYbfh4j2RC+59bngKfB21w5HylHTVVUDLzr0=; b=iOjbSLG4GBf2WTyQjvprClM/fuT6o5hUizsD2PDxSNfnjOPQiDPIC4uwq4hnyNxmfP /gaLS6kyFslCbYUS8Pp6+7pOYYfhqRZ+FFM8XqvX7J8UqBmnnL06hlDFRjzRQBWOL+ee /baJEMTW1P9jJE04rZLKsGegsGM5vvcuIxgZBrbM8HjBQQwiXcSvgZPU2nXg1+/YSDgd D0Rq4mf5Vthrr+MaF7LNKFGfwau5figKQqhAJp5ldD0vazr2JgQEXiB+l8xtZS8Td6lp rd+G7T4hTRxFJGasLHXIAW7dnpxqfh+DstIdrmrNTOKUBlQfTrptdqCa2uejdhb3Crhz 4qXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739023523; x=1739628323; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/dZ3JWAaYbfh4j2RC+59bngKfB21w5HylHTVVUDLzr0=; b=uGNTjj8TE5uLItaN2oeMnvZ9oEQ8WvXOawX93E547eW3eN/w1PFw2NCeBQABwI9EPM /WFmBj3jPohnnXymgND6ko38fNDB7r1ruRKVvNyB3M2WzNnjBafo9g1YWbOgf1i9LzK6 5DaHQHrjWb58P6tB2Hx7w9sn+tNpQ+Kbhr3APmz5cvG2+/fbHAXF6aDMMkdg3jMu/sOc clbplQbZABbuXUDNjEWz6h4bFtLHcbcVfVfor/tyQE+SY7IcFjhg0tyNKMjDUrDg65LF jlBzgMrAgIpN0myjg04TPH29Fv7ktcXHazshO2+GeKL1MbCg6sw/meUCZz3Zw+0xGccr dlgg== X-Gm-Message-State: AOJu0Yw2OU2qeYDpfw5t5bYNlVomBIhJ0dXlIUCOUBBvmD10s1RNPZo5 tSyBK4Jb0xRZl+lqugqWhzU0Zf+QsekrSzn/qptzdBXkujQi8EhL4pBOwh2uDKooPHiwytnOPSk T X-Gm-Gg: ASbGncvjF1jxewk7nGPzn+309ePwrFWoGrjYCRlGkNXfMbVSOO8u9zB1xq6shl5u7/h CGE669iXOvXbnEx1/gkJufN9xyQakXz5LleigTlWNdY5zpEXloJ3B4FD7YsY76WfJ+f+1jJkcIE PVOQPkRJ+ZEH5Q8f3/CC8ffUZBU6rEcJ4lf4N3xo+3FNRhUhlO1VLERyJbNn049BzvCsiaWdbZo NO7hEmr0gOlrlROqZYLg2eI5t7H+y8STXY3WICmuvTvWfnJafRgqa2JpwX3hrbfBHLTaEctnRIG Svsp X-Google-Smtp-Source: AGHT+IHLViJDNJorUrRbHoNKiCxeH47m8HKuk8261mrXYuaHBzgFZ+IzIxyMDj8RzyWTKYxeNKz+ZA== X-Received: by 2002:a17:90a:ec86:b0:2fa:13ce:bf16 with SMTP id 98e67ed59e1d1-2fa24068f50mr11042673a91.11.1739023523261; Sat, 08 Feb 2025 06:05:23 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c820sm47278345ad.173.2025.02.08.06.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 06:05:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/13] selftest/rust: correctly form the PATH environment variable Date: Sat, 8 Feb 2025 06:05:00 -0800 Message-ID: <72156282059aa5a013a386eb95f89dc38726326e.1739023409.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Feb 2025 14:05:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211033 From: Alexander Kanavin There were two issues here: - the path to native python was not included, so the test suite was running with host python, causing failures due to host python being given native libraries: https://autobuilder.yoctoproject.org/typhoon/#/builders/148/builds/1711/steps/12/logs/stdio (rust recipe uses native python throughout) - tmp/hosttools was listead ahead of native-sysroot/usr/bin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit aec96b5aec8d6b4a5ae8a719ca05bb727a6197cb) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/rust.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/rust.py b/meta/lib/oeqa/selftest/cases/rust.py index ca98f8c0fd..26f132edc4 100644 --- a/meta/lib/oeqa/selftest/cases/rust.py +++ b/meta/lib/oeqa/selftest/cases/rust.py @@ -208,9 +208,8 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): tmpdir = get_bb_var("TMPDIR", "rust") # Set path for target-poky-linux-gcc, RUST_TARGET_PATH and hosttools. - cmd = " export PATH=%s/recipe-sysroot-native/usr/bin:$PATH;" % rustlibpath - cmd = cmd + " export TARGET_VENDOR=\"-poky\";" - cmd = cmd + " export PATH=%s/recipe-sysroot-native/usr/bin/%s:%s/hosttools:$PATH;" % (rustlibpath, tcpath, tmpdir) + cmd = "export TARGET_VENDOR=\"-poky\";" + cmd = cmd + " export PATH=%s/recipe-sysroot-native/usr/bin/python3-native:%s/recipe-sysroot-native/usr/bin:%s/recipe-sysroot-native/usr/bin/%s:%s/hosttools:$PATH;" % (rustlibpath, rustlibpath, rustlibpath, tcpath, tmpdir) cmd = cmd + " export RUST_TARGET_PATH=%s/rust-targets;" % rustlibpath # Trigger testing. cmd = cmd + " export TEST_DEVICE_ADDR=\"%s:12345\";" % qemu.ip