From d76b902106e82f6c68ce525f068c994dd16d0aa2 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 8 Feb 2024 12:53:02 -0700 Subject: empty-application_2024.1.bb: Add processor suffix to elf files Add target processor suffix so that it doesn't conflict with app name under /lib/firmware direcory when you build emplty-application targeting different processor. Since empty_application in esw source code doesn't have any source(.c) files and it will act as template so inheriting esw_apps_common bbclass in not a right approach in this case. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../empty-application/empty-application_2024.1.bb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta-xilinx-standalone-experimental') diff --git a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb index d62779ae..2c70796a 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_2024.1.bb @@ -1,11 +1,9 @@ -inherit esw deploy +inherit esw deploy python3native ESW_COMPONENT_SRC = "/lib/sw_apps/empty_application/src/" DEPENDS += "libxil xiltimer" -inherit python3native - do_configure:prepend() { ( cd ${S} @@ -24,7 +22,7 @@ EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}" inherit image-artifact-names -CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${BB_CURRENT_MC}${IMAGE_VERSION_SUFFIX}" ESW_COMPONENT ??= "empty_application.elf" @@ -38,8 +36,8 @@ do_install() { do_deploy() { install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.elf - ln -sf ${CUSTOM_APP_BASE_NAME}.elf ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}.elf + ln -sf ${CUSTOM_APP_BASE_NAME}.elf ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}-${MACHINE}-${BB_CURRENT_MC}.elf install -m 0644 ${B}/empty_application.bin ${DEPLOYDIR}/${CUSTOM_APP_BASE_NAME}.bin - ln -sf ${CUSTOM_APP_BASE_NAME}.bin ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}.bin + ln -sf ${CUSTOM_APP_BASE_NAME}.bin ${DEPLOYDIR}/${CUSTOM_APP_IMAGE_NAME}-${MACHINE}-${BB_CURRENT_MC}.bin } addtask deploy before do_build after do_install -- cgit v1.2.3-54-g00ecf