From: Yongxin Liu <yongxin....@windriver.com>

The build script of qat17_4.24.0-00005 will put the firmware and
drivers under <path of rootfs>/lib. This is hardcoded in QAT's makefile.

When "usrmerge" is in DISTRO_FEATURES, "nonarch_base_libdir" is changed
to "/usr/lib", the recipe can install firmware to the correct location.
But we need to move all qat drivers to "/usr/lib/modules/<kernel version>".

Signed-off-by: Yongxin Liu <yongxin....@windriver.com>
---
 recipes-extended/qat/qat17_4.24.0-00005.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/recipes-extended/qat/qat17_4.24.0-00005.bb 
b/recipes-extended/qat/qat17_4.24.0-00005.bb
index f875334..c26fb7d 100644
--- a/recipes-extended/qat/qat17_4.24.0-00005.bb
+++ b/recipes-extended/qat/qat17_4.24.0-00005.bb
@@ -132,6 +132,12 @@ do_install() {
   install -D -m 0644 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf  
${D}${sysconfdir}/conf_files
   install -D -m 0644 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf.vm  
${D}${sysconfdir}/conf_files
 
+  if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+      mkdir -p ${D}${nonarch_base_libdir}/firmware
+      mv ${D}/lib/modules ${D}${nonarch_base_libdir}
+      rm -rf ${D}/lib
+  fi
+
   install -m 0644 ${S}/quickassist/qat/fw/qat_d15xx.bin  
${D}${nonarch_base_libdir}/firmware
   install -m 0644 ${S}/quickassist/qat/fw/qat_d15xx_mmp.bin  
${D}${nonarch_base_libdir}/firmware
 
-- 
2.45.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8359): 
https://lists.yoctoproject.org/g/meta-intel/message/8359
Mute This Topic: https://lists.yoctoproject.org/mt/107414209/21656
Group Owner: meta-intel+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to