From: Randolph Sapp <[email protected]> No reason to do this pre install now that my python function can evaluate file paths. Also, this may have been causing issues with state when attempting to switch between opencl enabled/disabled builds.
Signed-off-by: Randolph Sapp <[email protected]> Signed-off-by: Ryan Eatmon <[email protected]> --- .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 10 +++++----- .../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}" def get_file_list(package_list_var, d): file_list = [] package_list = d.getVar(package_list_var) - prefix = f"{d.getVar('S')}/" + prefix = f"{d.getVar('D')}/" if package_list: for package in package_list.split(): package_file_string = d.getVar(f"FILES:{package}") @@ -53,7 +53,7 @@ def get_file_list(package_list_var, d): file_list.append(f"{prefix}{package_file}") return " ".join(file_list) -do_install:prepend() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then for file in ${@get_file_list('GLES_PACKAGES', d)}; do rm -rf ${file} @@ -70,13 +70,13 @@ do_install:prepend() { done fi if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -e ${S}/lib/firmware ]; then - mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + if [ -e ${D}/lib/firmware ]; then + mv ${D}/lib/firmware ${D}${nonarch_base_libdir} fi fi # clean up any empty directories - find "${S}" -empty -type d -delete + find "${D}" -empty -type d -delete } 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}" def get_file_list(package_list_var, d): file_list = [] package_list = d.getVar(package_list_var) - prefix = f"{d.getVar('S')}/" + prefix = f"{d.getVar('D')}/" if package_list: for package in package_list.split(): package_file_string = d.getVar(f"FILES:{package}") @@ -54,7 +54,7 @@ def get_file_list(package_list_var, d): file_list.append(f"{prefix}{package_file}") return " ".join(file_list) -do_install:prepend() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then for file in ${@get_file_list('GLES_PACKAGES', d)}; do rm -rf ${file} @@ -71,13 +71,13 @@ do_install:prepend() { done fi if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -e ${S}/lib/firmware ]; then - mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + if [ -e ${D}/lib/firmware ]; then + mv ${D}/lib/firmware ${D}${nonarch_base_libdir} fi fi # clean up any empty directories - find "${S}" -empty -type d -delete + find "${D}" -empty -type d -delete } GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" -- 2.48.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#18311): https://lists.yoctoproject.org/g/meta-ti/message/18311 Mute This Topic: https://lists.yoctoproject.org/mt/111173672/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
