On Mon, 2024-06-24 at 00:32 +0300, Leon Anavi via lists.openembedded.org wrote:
> Replace references of WORKDIR with UNPACKDIR for U-Boot script
> and variable UBOOT_ENV_BINARY, for example for boot.scr.
>
> Signed-off-by: Leon Anavi <[email protected]>
> ---
> 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..9a91a0e3d8 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} ${UNPACKDIR}/${UBOOT_ENV_BINARY}
> fi
> }
If that command is writing a file, the written file should remain in
WORKDIR, not UNPACKDIR. I suspect the SRC should probably therefore be
changed but not the BINARY?
>
> @@ -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 ${UNPACKDIR}/${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 ${UNPACKDIR}/${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
Which would then make these unneeded?
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#201161):
https://lists.openembedded.org/g/openembedded-core/message/201161
Mute This Topic: https://lists.openembedded.org/mt/106839442/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
