diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-09-06 12:05:51 -0300 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-09-29 11:16:00 -0500 |
commit | 1ca59a8eae9c2c4fe5e3dbda5193e978c3583c0c (patch) | |
tree | 2b802cf513815a11fe27974005c21d5fed7d4da5 | |
parent | 0c872168cbdda012c9475ef486eb17a730393018 (diff) | |
download | meta-ti-1ca59a8eae9c2c4fe5e3dbda5193e978c3583c0c.tar.gz |
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 <max.krummenacher@toradex.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb | 4 |
1 files changed, 3 insertions, 1 deletions
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() { | |||
68 | done | 68 | done |
69 | fi | 69 | fi |
70 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then | 70 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then |
71 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} | 71 | if [ -e ${S}/lib/firmware ]; then |
72 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} | ||
73 | fi | ||
72 | fi | 74 | fi |
73 | 75 | ||
74 | # clean up any empty directories | 76 | # clean up any empty directories |