diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-09 17:02:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-21 12:08:04 +0100 |
commit | 71c6db8e65ced98db74fd18b726fa4b4c0346f05 (patch) | |
tree | 0e5d7f21a2d65ba5b562068eb44d4e9b34465bed /meta/recipes-bsp | |
parent | c6c1ed6ba0b7e529d955eeda71c4a66317fa1331 (diff) | |
download | poky-71c6db8e65ced98db74fd18b726fa4b4c0346f05.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 4 |
2 files changed, 3 insertions, 3 deletions
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() { | |||
58 | 58 | ||
59 | # Search for the grub.cfg on the local boot media by using the | 59 | # Search for the grub.cfg on the local boot media by using the |
60 | # built in cfg file provided via this recipe | 60 | # built in cfg file provided via this recipe |
61 | grub-mkimage -v -c ../cfg -p ${EFIDIR} -d ./grub-core/ \ | 61 | grub-mkimage -v -c ${UNPACKDIR}/cfg -p ${EFIDIR} -d ./grub-core/ \ |
62 | -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \ | 62 | -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \ |
63 | ${GRUB_MKIMAGE_MODULES} | 63 | ${GRUB_MKIMAGE_MODULES} |
64 | } | 64 | } |
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 () { | |||
259 | fi | 259 | fi |
260 | fi | 260 | fi |
261 | 261 | ||
262 | if [ -e ${WORKDIR}/fw_env.config ] ; then | 262 | if [ -e ${UNPACKDIR}/fw_env.config ] ; then |
263 | install -D -m 644 ${WORKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} | 263 | install -D -m 644 ${UNPACKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} |
264 | cd ${DEPLOYDIR} | 264 | cd ${DEPLOYDIR} |
265 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config-${MACHINE} | 265 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config-${MACHINE} |
266 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config | 266 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config |