From 1ca59a8eae9c2c4fe5e3dbda5193e978c3583c0c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 6 Sep 2023 12:05:51 -0300 Subject: [PATCH] ti-img-rogue-umlibs: harden handling of usrmerge Only move directories which haven't already been moved. This prevents a build error should a subsequent bitbake execution rerun do_install where the sources to 'mv' no longer exist. | mv: cannot stat 'ti-img-rogue-umlibs/23.1.6404501/git/targetfs/am62_linux/lws-generic/release/lib/firmware': No such file or directory Signed-off-by: Max Krummenacher Signed-off-by: Ryan Eatmon --- .../powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb index 9b45a91f..2cf13c60 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb @@ -68,7 +68,9 @@ do_install:prepend() { done fi if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + if [ -e ${S}/lib/firmware ]; then + mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + fi fi # clean up any empty directories