From: Adrian Freihofer Date: Tue, 3 Feb 2026 22:16:17 +0000 (+0100) Subject: devtool: ide-sdk find bitbake-setup init-build-env X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ab7e9e8e52fa123551438820c59b8c5e0c9c8a5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git devtool: ide-sdk find bitbake-setup init-build-env 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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)