From patchwork Wed Dec 31 11:46:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AdrianF X-Patchwork-Id: 77828 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 800F2EE6441 for ; Wed, 31 Dec 2025 11:47:51 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.83932.1767181666334252814 for ; Wed, 31 Dec 2025 03:47:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=adrian.freihofer@siemens.com header.s=fm2 header.b=rvrTuLzj; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-1329275-20251231114743a0f2243edd00020759-ypseai@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20251231114743a0f2243edd00020759 for ; Wed, 31 Dec 2025 12:47:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=adrian.freihofer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=A0HE8m6R38DCujzH58JuvE2k69Oj86MboGi7xB5tQt0=; b=rvrTuLzjgrFusre2NvSTDH6iV29vhbAQmymeovRWllCA0BpvtX44QjUgBgRacxW+vOeGJ4 1A/Unng6UHPpgDKMZC8VzSmNU3cFJEMnvEf/X3dX0U0O+pNSr5JL5qUPG9jHZl8Tbu8AZRYj x6bmOc4olq71UUvLstZvOTZDkaX/iAUGnX3G7+1ZnSWHEuKOEJmAwCeRvfqpnSMljbJMI0U1 PkfZlGAP11aYWWE65LEiX+bzeRVmY9OPvd8+P9T177A+fyarNLCOgLhzYFsfRq5pUohLKIat oBUQe6O09SORfYu2HMoHcuGj0/AmUK7sTq6aLV+I9NktOKsZ5Hi4JOZw==; From: AdrianF To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 01/14] devtool: ide-sdk find bitbake-setup init-build-env Date: Wed, 31 Dec 2025 12:46:31 +0100 Message-ID: <20251231114718.4031606-2-adrian.freihofer@siemens.com> In-Reply-To: <20251231114718.4031606-1-adrian.freihofer@siemens.com> References: <20251231114718.4031606-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1329275:519-21489:flowmailer 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, 31 Dec 2025 11:47:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228742 From: Adrian Freihofer With poky the oe-init-build-env script from the top level directory of the layer with the higher priority is used to setup the build environment. This does no longer work with bitbake-setup. The directory layout changed and the script is now called init-build-env. Skip the old implementation if $TOPDIR/init-build-env exists and use it instead. Signed-off-by: Adrian Freihofer --- scripts/lib/devtool/ide_sdk.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 87a4c13ec5..9df88454c7 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py @@ -269,6 +269,7 @@ class RecipeNotModified: class RecipeModified: """Handling of recipes in the workspace created by devtool modify""" OE_INIT_BUILD_ENV = 'oe-init-build-env' + INIT_BUILD_ENV = 'init-build-env' VALID_BASH_ENV_NAME_CHARS = re.compile(r"^[a-zA-Z0-9_]*$") @@ -743,7 +744,13 @@ class RecipeModified: @property def oe_init_build_env(self): - """Find the oe-init-build-env used for this setup""" + """Find the init-build-env used for this setup""" + # bitbake-setup mode + bb_setup_init = os.path.join(self.topdir, RecipeModified.INIT_BUILD_ENV) + if os.path.exists(bb_setup_init): + return os.path.abspath(bb_setup_init) + + # poky mode oe_init_dir = self.oe_init_dir if oe_init_dir: return os.path.join(oe_init_dir, RecipeModified.OE_INIT_BUILD_ENV)