From 71c6db8e65ced98db74fd18b726fa4b4c0346f05 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 May 2024 17:02:39 +0100 Subject: recipes: Start WORKDIR -> UNPACKDIR transition Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR. (From OE-Core rev: 1f18b9a512800860d5153d89eb82b56388efad6f) Signed-off-by: Richard Purdie --- meta/recipes-bsp/grub/grub-efi_2.12.bb | 2 +- meta/recipes-bsp/u-boot/u-boot.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/grub/grub-efi_2.12.bb b/meta/recipes-bsp/grub/grub-efi_2.12.bb index 9857e8e036..7df77deca3 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.12.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.12.bb @@ -58,7 +58,7 @@ do_mkimage() { # Search for the grub.cfg on the local boot media by using the # built in cfg file provided via this recipe - grub-mkimage -v -c ../cfg -p ${EFIDIR} -d ./grub-core/ \ + grub-mkimage -v -c ${UNPACKDIR}/cfg -p ${EFIDIR} -d ./grub-core/ \ -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \ ${GRUB_MKIMAGE_MODULES} } diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 3a7afb81c8..45d700fbdd 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -259,8 +259,8 @@ do_deploy () { fi fi - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -D -m 644 ${WORKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} + if [ -e ${UNPACKDIR}/fw_env.config ] ; then + install -D -m 644 ${UNPACKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} cd ${DEPLOYDIR} ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config-${MACHINE} ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config -- cgit v1.2.3-54-g00ecf