diff mbox series

[meta-ti] ti-img-rogue-umlibs: drop handling of usrmerge

Message ID 20230906090253.3615190-1-max.oss.09@gmail.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti] ti-img-rogue-umlibs: drop handling of usrmerge | expand

Commit Message

Max Krummenacher Sept. 6, 2023, 9:02 a.m. UTC 
From: Max Krummenacher <max.krummenacher@toradex.com>

If usrmerge is set the do_rootfs task creates symlinks for the base
directories to their equivalent /usr/ directories and thus installs
the files in /usr/{bin|lib|...} by following the symlinks.
There is no need to do the move already here.

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>
---
 .../powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb         | 3 ---
 1 file changed, 3 deletions(-)
diff mbox series

Patch

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..8033322c 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
@@ -67,9 +67,6 @@  do_install:prepend() {
             rm -rf ${file}
         done
     fi
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
-        mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
-    fi
 
     # clean up any empty directories
     find "${S}" -empty -type d -delete