CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: bitbake-setup: dash support for init-build-env script

Browse Source 
Being minimalist, dash does not support the (non-POSIX) feature of
passing an argument while sourcing a script. Like in
  . <some path>/oe-init-build-env <build dir>

With dash, one must use:
  set <build dir>       # puts <build dir> in $1
  cd <some path>
  . ./oe-init-build-env # can only be called from its directory in dash

To do this:
* Instead of a symlink to oe-init-build-env, keep a symlink to the
  directory containing it (called "oe-init-build-env-dir")
* Generate a init-build-env script that dash can source using the above
  snippet.

(Bitbake rev: 442b41c7949e1522212b66b16811f6b64b089b23)

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yoann Congal 2025-10-02 12:09:24 +02:00 committed by Richard Purdie
parent 47f6bd30b4
commit 0c37775349
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bitbake/bin/bitbake-setup
View File

@ -101,13 +101,13 @@ def checkout_layers(layers, layerdir, d):
if os.path.exists(os.path.join(layerdir, repodir, 'scripts/oe-setup-build')):
oesetupbuild = os.path.join(layerdir, repodir, 'scripts/oe-setup-build')
oeinitbuildenv = os.path.join(layerdir, repodir, 'oe-init-build-env')
oeinitbuildenvdir = os.path.join(layerdir, repodir)
print(" ")
_write_layer_list(layerdir, repodirs)
if oesetupbuild:
links = {'setup-build': oesetupbuild, 'oe-scripts': os.path.dirname(oesetupbuild), 'init-build-env': oeinitbuildenv}
links = {'setup-build': oesetupbuild, 'oe-scripts': os.path.dirname(oesetupbuild), 'oe-init-build-env-dir': oeinitbuildenvdir}
for l,t in links.items():
symlink = os.path.join(layerdir, l)
if os.path.lexists(symlink):
@ -145,8 +145,9 @@ def setup_bitbake_build(bitbake_config, layerdir, builddir):
with open(os.path.join(build_conf_dir, "conf-notes.txt"), 'w') as f:
f.write("")
def _make_init_build_env(builddir, initbuildenv):
cmd = ". {} {}".format(initbuildenv, builddir)
def _make_init_build_env(builddir, oeinitbuildenvdir):
builddir = os.path.realpath(builddir)
cmd = "cd {}\nset {}\n. ./oe-init-build-env\n".format(oeinitbuildenvdir, builddir)
initbuild_in_builddir = os.path.join(builddir, 'init-build-env')
with open(initbuild_in_builddir, 'w') as f:
f.write(cmd)
@ -174,11 +175,11 @@ def setup_bitbake_build(bitbake_config, layerdir, builddir):
if template:
bb.process.run("{} setup -c {} -b {} --no-shell".format(oesetupbuild, template, bitbake_builddir))
else:
initbuildenv = os.path.join(layerdir, 'init-build-env')
if not os.path.exists(initbuildenv):
oeinitbuildenvdir = os.path.join(layerdir, 'oe-init-build-env-dir')
if not os.path.exists(os.path.join(oeinitbuildenvdir, "oe-init-build-env")):
print("Could not find oe-init-build-env in any of the layers; please use another mechanism to initialize the bitbake environment")
return
_make_init_build_env(bitbake_builddir, os.path.realpath(initbuildenv))
_make_init_build_env(bitbake_builddir, os.path.realpath(oeinitbuildenvdir))
siteconf_symlink = os.path.join(bitbake_confdir, "site.conf")
siteconf = os.path.normpath(os.path.join(builddir, '..', "site.conf"))