diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-12-11 13:22:05 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2023-12-11 13:34:11 +0100 |
| commit | df4ecdbdd4c8f8fae2656aa34fe7060392230b92 (patch) | |
| tree | 99ac102168e493062b2790fda3e9602acda04a74 | |
| parent | 97905d66c85df8cca1a56d0606e9b40eed9c29ae (diff) | |
local.conf skeleton: improve handling of deploy directory location
Commit 97905d6 ("local.conf skeleton: fix build with common deploy
directory") fixed build failures due to multiconfig builds and
changes in what fails may be deployed from multiple recipes.
Integrating that in to CI/CD proofed difficult as there we have to
override DEPLOY_DIR to preserve artifacts into different location.
Improve the fix to have it easier to integrate it into CI/CD.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | buildconf/local.conf | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/buildconf/local.conf b/buildconf/local.conf index cd32785..3da0408 100644 --- a/buildconf/local.conf +++ b/buildconf/local.conf @@ -100,19 +100,17 @@ SSTATE_DIR ?= "${TOPDIR}/../sstate-cache" # if you have several build directories you need to adjust deploy # to something unique, e.g. "${TOPDIR}/../deploy_fb" "${TOPDIR}/../deploy_x11" # -# In case of TI k3 a multiconfig is configured with a tmp directory for each -# multiconfig. In that case all native recipe build deploy identical license -# files into the deploy directories. +# In case of a multiconfig (e.g. TI's k3 architecture) separate the deploy +# dirs. All native recipe deploy identical license files into the deploy directories. # If having one deploy directory for all configs this results in build errors # for any build executed after the first one. -# Workaround this by only having the 'images' and 'sdk' subdirectory outside -# of tmp. -# We have to do this for all our images in order to be able to build -# TI and non TI based images in one setup. +# Thus configure a deploy directory with the name of the multiconfig inside the +# default deploy directory. +# If build artefacts are needed for the final image additional work may be +# needed, follow TI_COMMON_DEPLOY to see how that is than in the k3 case. # TI_COMMON_DEPLOY = "${TOPDIR}/deploy" -DEPLOY_DIR_IMAGE = "${TI_COMMON_DEPLOY}/images/${MACHINE}" -SDK_DEPLOY = "${TI_COMMON_DEPLOY}/sdk" +DEPLOY_DIR = "${TI_COMMON_DEPLOY}${@'' if d.getVar('BB_CURRENT_MC') == 'default' else '/${BB_CURRENT_MC}'}" # # Package Management configuration |