From 09890bc1ce3d1836f0e35fbae7713f54d70a72ae Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Fri, 3 Nov 2023 13:02:19 +0100 Subject: Fixup folder change in meta-ti-bsp Meta-ti-bsp breaks expectations of the output folder in its layer.conf Enforce the usual folder structure. Bug-AGL: SPEC-4957 Change-Id: Ie887e83015dcb9be609289442840b131cbad1b32 Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29379 --- meta-agl-bsp/conf/include/agl_bbe.inc | 4 ++++ meta-agl-bsp/conf/include/agl_beaglebone.inc | 4 ++++ meta-agl-bsp/conf/include/agl_j721e-evm.inc | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl-bsp/conf/include/agl_bbe.inc index 56c88a4a9..5252c558b 100644 --- a/meta-agl-bsp/conf/include/agl_bbe.inc +++ b/meta-agl-bsp/conf/include/agl_bbe.inc @@ -18,3 +18,7 @@ SECURITY_CFLAGS:pn-gpm = "" SECURITY_LDFLAGS:pn-gpm = "" SECURITY_CFLAGS:pn-libatasmart = "" SECURITY_LDFLAGS:pn-libatasmart = "" + +# meta-ti-bsp layer conf does break expectations wrt common folders +# meta-ti-bsp/conf/layer.conf:TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti" +TI_COMMON_DEPLOY := "${TMPDIR}/deploy" \ No newline at end of file diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc index 0f61caaaa..ec3a3a448 100644 --- a/meta-agl-bsp/conf/include/agl_beaglebone.inc +++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc @@ -4,3 +4,7 @@ DISTRO_FEATURES:append = " agl-medium-arm-compiler" WKS_FILE = "sdimage-bootpart-uuid.wks" + +# meta-ti-bsp layer conf does break expectations wrt common folders +# meta-ti-bsp/conf/layer.conf:TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti" +TI_COMMON_DEPLOY := "${TMPDIR}/deploy" \ No newline at end of file diff --git a/meta-agl-bsp/conf/include/agl_j721e-evm.inc b/meta-agl-bsp/conf/include/agl_j721e-evm.inc index 61a4794f6..c0195f183 100644 --- a/meta-agl-bsp/conf/include/agl_j721e-evm.inc +++ b/meta-agl-bsp/conf/include/agl_j721e-evm.inc @@ -5,3 +5,7 @@ DEFAULTTUNE:k3r5 = "armv7athf" # Workaround for recipe assumption of poky location LIC_FILES_CHKSUM:pn-ti-rtos-firmware = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" + +# meta-ti-bsp layer conf does break expectations wrt common folders +# meta-ti-bsp/conf/layer.conf:TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti" +TI_COMMON_DEPLOY := "${TMPDIR}/deploy" \ No newline at end of file -- cgit 1.2.3-korg