diff options
author | Randolph Sapp <rs@ti.com> | 2023-06-26 11:41:10 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-06-26 11:49:47 -0500 |
commit | 818aa0aaefee2180c2039b65fb2fc9049cdb9b57 (patch) | |
tree | 3316587a49b149a8121da9972c3435c4dd9faa46 | |
parent | 19938f953e23d8d96cb12507b5894c3b6263b0fc (diff) | |
download | meta-ti-818aa0aaefee2180c2039b65fb2fc9049cdb9b57.tar.gz |
ti-img-rogue-umlibs: absolute path for file globs
Edit the file paths so they point at files in the source directory
explicitly. For some reason shell glob were previously only respected by
some machines.
Signed-off-by: Randolph Sapp <rs@ti.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 | 27 |
1 files changed, 14 insertions, 13 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 9f129c9d..12acc695 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 | |||
@@ -40,36 +40,37 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" | |||
40 | def get_file_list(package_list_var, d): | 40 | def get_file_list(package_list_var, d): |
41 | file_list = [] | 41 | file_list = [] |
42 | package_list = d.getVar(package_list_var) | 42 | package_list = d.getVar(package_list_var) |
43 | prefix = f"{d.getVar('S')}/" | ||
43 | if package_list: | 44 | if package_list: |
44 | for package in package_list.split(): | 45 | for package in package_list.split(): |
45 | package_files = d.getVar(f"FILES:{package}") | 46 | package_file_string = d.getVar(f"FILES:{package}") |
46 | if package_files: | 47 | if package_file_string: |
47 | file_list.append(package_files) | 48 | for package_file in package_file_string.split(): |
49 | file_list.append(f"{prefix}{package_file}") | ||
48 | return " ".join(file_list) | 50 | return " ".join(file_list) |
49 | 51 | ||
50 | do_install:append() { | 52 | do_install:prepend() { |
51 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then | 53 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then |
52 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do | 54 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do |
53 | rm -rf ${D}/${file} | 55 | rm -rf ${file} |
54 | rmdir --ignore-fail-on-non-empty $(dirname ${D}/${file}) | ||
55 | done | 56 | done |
56 | fi | 57 | fi |
57 | if ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', 'false', 'true', d)}; then | 58 | if ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', 'false', 'true', d)}; then |
58 | for file in ${@get_file_list('VULKAN_PACKAGES', d)}; do | 59 | for file in ${@get_file_list('VULKAN_PACKAGES', d)}; do |
59 | rm -rf ${D}/${file} | 60 | rm -rf ${file} |
60 | rmdir --ignore-fail-on-non-empty $(dirname ${D}/${file}) | ||
61 | done | 61 | done |
62 | fi | 62 | fi |
63 | if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'false', 'true', d)}; then | 63 | if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'false', 'true', d)}; then |
64 | for file in ${@get_file_list('OPENCL_PACKAGES', d)}; do | 64 | for file in ${@get_file_list('OPENCL_PACKAGES', d)}; do |
65 | rm -rf ${D}/${file} | 65 | rm -rf ${file} |
66 | rmdir --ignore-fail-on-non-empty $(dirname ${D}/${file}) | ||
67 | done | 66 | done |
68 | fi | 67 | fi |
69 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then | 68 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then |
70 | mv ${D}/lib/firmware ${D}${nonarch_base_libdir} | 69 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} |
71 | rmdir ${D}/lib | ||
72 | fi | 70 | fi |
71 | |||
72 | # clean up any empty directories | ||
73 | find "${S}" -empty -type d -delete | ||
73 | } | 74 | } |
74 | 75 | ||
75 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" | 76 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" |