summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2023-11-29 15:13:02 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2023-11-29 17:26:51 +0100
commit97905d66c85df8cca1a56d0606e9b40eed9c29ae (patch)
treef5df53cf790ec4133f006842063880d028d8d0b9
parent85eaeb976d490ad63ac10cf0381c52e541cf9b45 (diff)
local.conf skeleton: fix build with common deploy directory
openembedded-core tightend the rules on what files are allowed to be deployed into the deploy directory from two (or more) recipes. As a result builds now fail for Verdin AM62, as both the default and the k3r5 config deploy license files into the same directory with the same name. This has been seen on with ‘native’ recipes. | ERROR: mc:k3r5:python3-rfc3987-native-1.3.8-r0 do_populate_lic_setscene: Recipe python3-rfc3987-native is trying to install files into a shared area when those files already exist. The files and the manifests listing them are: | .../tmp-glibc/deploy/licenses/x86_64/python3-rfc3987-native/PKG-INFO | (not matched to any task) Related-to: ELB-5485 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--buildconf/local.conf16
1 files changed, 14 insertions, 2 deletions
diff --git a/buildconf/local.conf b/buildconf/local.conf
index bcd362d..cd32785 100644
--- a/buildconf/local.conf
+++ b/buildconf/local.conf
@@ -99,8 +99,20 @@ SSTATE_DIR ?= "${TOPDIR}/../sstate-cache"
# This places the build output in parallel to build and layers thus
# if you have several build directories you need to adjust deploy
# to something unique, e.g. "${TOPDIR}/../deploy_fb" "${TOPDIR}/../deploy_x11"
-DEPLOY_DIR = "${TOPDIR}/deploy"
-TI_COMMON_DEPLOY = "${DEPLOY_DIR}"
+#
+# 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.
+# 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.
+#
+TI_COMMON_DEPLOY = "${TOPDIR}/deploy"
+DEPLOY_DIR_IMAGE = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
+SDK_DEPLOY = "${TI_COMMON_DEPLOY}/sdk"
#
# Package Management configuration