diff options
-rw-r--r-- | meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 10 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb index 40835439..675edc14 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | |||
@@ -44,7 +44,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" | |||
44 | def get_file_list(package_list_var, d): | 44 | def get_file_list(package_list_var, d): |
45 | file_list = [] | 45 | file_list = [] |
46 | package_list = d.getVar(package_list_var) | 46 | package_list = d.getVar(package_list_var) |
47 | prefix = f"{d.getVar('S')}/" | 47 | prefix = f"{d.getVar('D')}/" |
48 | if package_list: | 48 | if package_list: |
49 | for package in package_list.split(): | 49 | for package in package_list.split(): |
50 | package_file_string = d.getVar(f"FILES:{package}") | 50 | package_file_string = d.getVar(f"FILES:{package}") |
@@ -53,7 +53,7 @@ def get_file_list(package_list_var, d): | |||
53 | file_list.append(f"{prefix}{package_file}") | 53 | file_list.append(f"{prefix}{package_file}") |
54 | return " ".join(file_list) | 54 | return " ".join(file_list) |
55 | 55 | ||
56 | do_install:prepend() { | 56 | do_install:append() { |
57 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then | 57 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then |
58 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do | 58 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do |
59 | rm -rf ${file} | 59 | rm -rf ${file} |
@@ -70,13 +70,13 @@ do_install:prepend() { | |||
70 | done | 70 | done |
71 | fi | 71 | fi |
72 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then | 72 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then |
73 | if [ -e ${S}/lib/firmware ]; then | 73 | if [ -e ${D}/lib/firmware ]; then |
74 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} | 74 | mv ${D}/lib/firmware ${D}${nonarch_base_libdir} |
75 | fi | 75 | fi |
76 | fi | 76 | fi |
77 | 77 | ||
78 | # clean up any empty directories | 78 | # clean up any empty directories |
79 | find "${S}" -empty -type d -delete | 79 | find "${D}" -empty -type d -delete |
80 | } | 80 | } |
81 | 81 | ||
82 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" | 82 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" |
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb index 0de66b72..b8153711 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb | |||
@@ -45,7 +45,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" | |||
45 | def get_file_list(package_list_var, d): | 45 | def get_file_list(package_list_var, d): |
46 | file_list = [] | 46 | file_list = [] |
47 | package_list = d.getVar(package_list_var) | 47 | package_list = d.getVar(package_list_var) |
48 | prefix = f"{d.getVar('S')}/" | 48 | prefix = f"{d.getVar('D')}/" |
49 | if package_list: | 49 | if package_list: |
50 | for package in package_list.split(): | 50 | for package in package_list.split(): |
51 | package_file_string = d.getVar(f"FILES:{package}") | 51 | package_file_string = d.getVar(f"FILES:{package}") |
@@ -54,7 +54,7 @@ def get_file_list(package_list_var, d): | |||
54 | file_list.append(f"{prefix}{package_file}") | 54 | file_list.append(f"{prefix}{package_file}") |
55 | return " ".join(file_list) | 55 | return " ".join(file_list) |
56 | 56 | ||
57 | do_install:prepend() { | 57 | do_install:append() { |
58 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then | 58 | if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then |
59 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do | 59 | for file in ${@get_file_list('GLES_PACKAGES', d)}; do |
60 | rm -rf ${file} | 60 | rm -rf ${file} |
@@ -71,13 +71,13 @@ do_install:prepend() { | |||
71 | done | 71 | done |
72 | fi | 72 | fi |
73 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then | 73 | if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then |
74 | if [ -e ${S}/lib/firmware ]; then | 74 | if [ -e ${D}/lib/firmware ]; then |
75 | mv ${S}/lib/firmware ${S}${nonarch_base_libdir} | 75 | mv ${D}/lib/firmware ${D}${nonarch_base_libdir} |
76 | fi | 76 | fi |
77 | fi | 77 | fi |
78 | 78 | ||
79 | # clean up any empty directories | 79 | # clean up any empty directories |
80 | find "${S}" -empty -type d -delete | 80 | find "${D}" -empty -type d -delete |
81 | } | 81 | } |
82 | 82 | ||
83 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" | 83 | GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" |