From 583f1e55cc27857b929d2b8e6ec278dba0157529 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Thu, 27 Jun 2024 11:11:01 +0300 Subject: [PATCH] u-boot.inc: WORKDIR -> UNPACKDIR transition Replace references of WORKDIR with UNPACKDIR and B for U-Boot script and variable UBOOT_ENV_BINARY, for example for boot.scr. (From OE-Core rev: 62ff94ff40e823065178318133d54e44a3d8a46d) Signed-off-by: Leon Anavi Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 45d700fbdd..ce14847b33 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -92,7 +92,7 @@ do_compile () { if [ -n "${UBOOT_ENV}" ] && [ "${UBOOT_ENV_SUFFIX}" = "scr" ] then - ${UBOOT_MKIMAGE} -C none -A ${UBOOT_ARCH} -T script -d ${WORKDIR}/${UBOOT_ENV_SRC} ${WORKDIR}/${UBOOT_ENV_BINARY} + ${UBOOT_MKIMAGE} -C none -A ${UBOOT_ARCH} -T script -d ${UNPACKDIR}/${UBOOT_ENV_SRC} ${B}/${UBOOT_ENV_BINARY} fi } @@ -188,7 +188,7 @@ do_install () { if [ -n "${UBOOT_ENV}" ] then - install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} + install -m 644 ${B}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} fi @@ -324,7 +324,7 @@ do_deploy () { if [ -n "${UBOOT_ENV}" ] then - install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} + install -m 644 ${B}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} fi