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:21:02 -0500 |
commit | acddc8924d925ea7e7b07e030b3f9b6582a6f8f1 (patch) | |
tree | d92e2b2ed3593ff9cfdb830ec1a2e7e623217f6f | |
parent | e4d60ab2c8565eaabbad1d51972296e412744190 (diff) | |
download | meta-ti-acddc8924d925ea7e7b07e030b3f9b6582a6f8f1.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 aa1050d5..0d02f12a 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 | |||
@@ -66,7 +66,9 @@ do_install:prepend() { | |||
66 | done | 66 | done |
67 | fi | 67 | fi |
68 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then | 68 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then |
69 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} | 69 | if [ -e ${S}/lib/firmware ]; then |
70 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} | ||
71 | fi | ||
70 | fi | 72 | fi |
71 | 73 | ||
72 | # clean up any empty directories | 74 | # clean up any empty directories |