From patchwork Wed Jul 1 16:12:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 91516 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 32F60C43327 for ; Wed, 1 Jul 2026 16:12:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.48979.1782922375373420022 for ; Wed, 01 Jul 2026 09:12:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=BW/d9NQN; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7DF3D452F for ; Wed, 1 Jul 2026 09:12:50 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 758A33F673 for ; Wed, 1 Jul 2026 09:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782922374; bh=wI9RM5BXFZARDltHp2kWTVKh7rK3PO4GSyHq669Rxgo=; h=From:To:Subject:Date:From; b=BW/d9NQNsKQPZ/4OAMmxfGmmXuHXahxPysVSyuUzGTk94Vw4SyCwevdJvxt2uFvt9 mbNXc9zWY5/I+FWwEbEfE+35I6tvp4vNfZ5Fh1Pen1CmvA2KtCAP016Q6UAqFVUID4 SxlrcRCZGsWkuen1ronN3KXyoK2w6Go1sSiVwt2M= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] meson: add explanatory comment to the meson-native wrapper script Date: Wed, 1 Jul 2026 17:12:48 +0100 Message-ID: <20260701161250.980101-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 01 Jul 2026 16:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/239988 Add a clarification comment because it's not immediately obvious that meson-native is used in eSDKs (whereas nativesdk-meson is used in a SDK). Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson/meson-wrapper | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index 3aa1a93520c..570b550e019 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper @@ -1,5 +1,7 @@ #!/bin/sh +# If this wrapper script is being ran in a normal build environment and not an +# eSDK, then just call the real script directly. if [ -z "$OECORE_NATIVE_SYSROOT" ]; then exec "meson.real" "$@" fi From patchwork Wed Jul 1 16:12:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 91517 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 33EB7C43458 for ; Wed, 1 Jul 2026 16:12:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.48980.1782922376116031098 for ; Wed, 01 Jul 2026 09:12:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=ZikfrI8n; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 33ECA4537 for ; Wed, 1 Jul 2026 09:12:51 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 310403F673 for ; Wed, 1 Jul 2026 09:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782922375; bh=I+2FA1mSOApcB9KLwDy6NOKewsZ/EcSzQegPeymG000=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZikfrI8ndU/M7wL3F5fvGengyRMQZsprYbkrYH1ScXIJJa7XK7mmcOAP/GTprUTcS rFCqjeId0IL8YNIgt2x3EvnbcEPZiY3jBVHgqdAg2zVflsaokO65AcV91tbuptEALx NEmsZ1WlF5CD67+QE2NNDawPAM0X5GhbOJfPd0/g= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] meson: remove obsolete environment unsets Date: Wed, 1 Jul 2026 17:12:49 +0100 Message-ID: <20260701161250.980101-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260701161250.980101-1-ross.burton@arm.com> References: <20260701161250.980101-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 01 Jul 2026 16:12:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/239989 We no longer need to remove environment variables because their behaviour was fixed in meson 0.54.0[1]. The corresponding cleanup was done in meson.bbclass some time ago[2] but was not done here. [1] https://mesonbuild.com/Release-notes-for-0-54-0.html#environment-variables-with-cross-builds [2] oe-core 20a5af2583d ("meson: use native-file instead of environment variables") Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson/meson-wrapper | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index 570b550e019..a0c1da23299 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper @@ -10,11 +10,6 @@ if [ -z "$SSL_CERT_DIR" ]; then export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/etc/ssl/certs/" fi -# If these are set to a cross-compile path, meson will get confused and try to -# use them as native tools. Unset them to prevent this, as all the cross-compile -# config is already in meson.cross. -unset CC CXX CPP LD AR NM STRIP - case "$1" in setup|configure|dist|install|introspect|init|test|wrap|subprojects|rewrite|compile|devenv|env2mfile|help) MESON_CMD="$1" From patchwork Wed Jul 1 16:12:50 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 91518 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 07C3DC43458 for ; Wed, 1 Jul 2026 16:13:07 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.49040.1782922376775060959 for ; Wed, 01 Jul 2026 09:12:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=R1dB1EWw; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E4B7A452F for ; Wed, 1 Jul 2026 09:12:51 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DE9953F673 for ; Wed, 1 Jul 2026 09:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1782922376; bh=wCYAUt7u/hesQLKXEJuk7YvEtHt0IzpINzISIcHTfco=; h=From:To:Subject:Date:In-Reply-To:References:From; b=R1dB1EWwSrx1SYGEFzIAI5wB3SA9gXXqB+cqOfNmDF2sJi67f+jF5y8/om1x/VylD 4Ama78h0vZO0myaR3quHhiz7RNYHE5xSG30DYoLJlu3ryFLLu514NG/X8Bb5PM16Un d9dUw8EAGy/q1zbHlkxCCv6cB8ZMTVWg7rCfIjFw= From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] meson: remove obsolete SSL_CERT_DIR assignment in the wrapper script Date: Wed, 1 Jul 2026 17:12:50 +0100 Message-ID: <20260701161250.980101-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260701161250.980101-1-ross.burton@arm.com> References: <20260701161250.980101-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 01 Jul 2026 16:13:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/239990 The wrapper script no longer needs to set SSL_CERT_DIR to what it hopes is the right path, as openssl now does this when initialising the SDK[1]. [1] oe-core d6b15d1e70b ("openssl: export necessary env vars in SDK") Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson/meson-wrapper | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index a0c1da23299..57eafca26aa 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper @@ -6,10 +6,6 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then exec "meson.real" "$@" fi -if [ -z "$SSL_CERT_DIR" ]; then - export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/etc/ssl/certs/" -fi - case "$1" in setup|configure|dist|install|introspect|init|test|wrap|subprojects|rewrite|compile|devenv|env2mfile|help) MESON_CMD="$1"