Hardcoded /lib is not compatible with usrmerge.
Signed-off-by: Ricardo Salveti ricardo@opensourcefoundries.com --- meta-optee/recipes-security/optee/optee-os_git.bb | 8 ++++---- meta-optee/recipes-security/optee/optee-test_git.bb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta-optee/recipes-security/optee/optee-os_git.bb b/meta-optee/recipes-security/optee/optee-os_git.bb index 4f6be1e..c5f38fb 100644 --- a/meta-optee/recipes-security/optee/optee-os_git.bb +++ b/meta-optee/recipes-security/optee/optee-os_git.bb @@ -39,9 +39,9 @@ do_compile() {
do_install() { #install core on boot directory - install -d ${D}/lib/firmware/ + install -d ${D}${nonarch_base_libdir}/firmware/
- install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.bin ${D}/lib/firmware/ + install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.bin ${D}${nonarch_base_libdir}/firmware/ #install TA devkit install -d ${D}/usr/include/optee/export-user_ta/
@@ -54,14 +54,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
do_deploy() { install -d ${DEPLOYDIR}/optee - for f in ${D}/lib/firmware/*; do + for f in ${D}${nonarch_base_libdir}/firmware/*; do install -m 644 $f ${DEPLOYDIR}/optee/ done }
addtask deploy before do_build after do_install
-FILES_${PN} = "/lib/firmware/" +FILES_${PN} = "${nonarch_base_libdir}/firmware/" FILES_${PN}-dev = "/usr/include/optee"
INSANE_SKIP_${PN}-dev = "staticdev" diff --git a/meta-optee/recipes-security/optee/optee-test_git.bb b/meta-optee/recipes-security/optee/optee-test_git.bb index 2d85d89..e2c49cc 100644 --- a/meta-optee/recipes-security/optee/optee-test_git.bb +++ b/meta-optee/recipes-security/optee/optee-test_git.bb @@ -40,11 +40,11 @@ do_install () {
# install path should match the value set in optee-client/tee-supplicant # default TEEC_LOAD_PATH is /lib - mkdir -p ${D}/lib/optee_armtz/ - install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}/lib/optee_armtz/ + mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/ + install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/ }
-FILES_${PN} += "/lib/optee_armtz/" +FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/"
# Imports machine specific configs from staging to build PACKAGE_ARCH = "${MACHINE_ARCH}"