From 5640f6592c984f4832ff5f2ed1a35a607e5d21c5 Mon Sep 17 00:00:00 2001
From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Wed, 28 May 2025 16:01:39 +0800
Subject: [PATCH] linux-npu-driver : fix multilib install issue

Make sure libraries are installed correctly even when libdir is not /usr/lib.
Fixes:

ERROR: linux-npu-driver-1.17.0-r0 do_package: QA Issue: linux-npu-driver: Files/directories were installed but not shipped in any package:
  /lib
  /lib/firmware
  /lib/firmware/updates
  /lib/firmware/updates/intel
  /lib/firmware/updates/intel/vpu
  /lib/firmware/updates/intel/vpu/vpu_40xx_v0.0.bin
  /lib/firmware/updates/intel/vpu/vpu_37xx_v0.0.bin
  /lib/firmware/updates/intel/vpu/mtl_vpu_v0.0.bin
  /lib/firmware/updates/intel/vpu/vpu_40xx_v1.bin
  /lib/firmware/updates/intel/vpu/vpu_37xx_v1.bin
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...pu-driver-fix-multilib-install-issue.patch | 28 +++++++++++++++++++
 .../linux-npu-driver_1.17.0.bb                |  9 ++----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch

diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
new file mode 100644
index 00000000..71a60b20
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
@@ -0,0 +1,28 @@
+From 561e3b5edc0ec3d8835aaf8ef8e5c9e8f9b53061 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Wed, 28 May 2025 13:35:18 +0800
+Subject: [PATCH] linux-npu-driver : fix multilib install issue
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ firmware/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
+index 0c093ca..ba346a0 100644
+--- a/firmware/CMakeLists.txt
++++ b/firmware/CMakeLists.txt
+@@ -12,7 +12,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE include)
+ file(GLOB FIRMWARE_BINARIES ${CMAKE_CURRENT_SOURCE_DIR}/bin/*.bin)
+ if (FIRMWARE_BINARIES)
+   install(FILES ${FIRMWARE_BINARIES}
+-    DESTINATION /lib/firmware/updates/intel/vpu/
++    DESTINATION ${CMAKE_INSTALL_FIRMWARE_DIR}/firmware/updates/intel/vpu/
+     PERMISSIONS OWNER_READ
+     COMPONENT fw-npu)
+ endif()
+-- 
+2.37.3
+
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
index 4f75cc01..2014e448 100644
--- a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
@@ -10,6 +10,7 @@ SRC_URI = "git://github.com/intel/linux-npu-driver.git;protocol=https;name=linux
             git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=git/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \
             git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=git/third_party/level-zero-npu-extensions;name=lzvext;nobranch=1 \
             git://github.com/google/googletest.git;protocol=https;destsuffix=git/third_party/googletest;name=googletest;nobranch=1 \
+            file://0001-linux-npu-driver-fix-multilib-install-issue.patch \
         "
 
 SRCREV_linux-npu-driver = "0fe92dd0720448fb571f0ac4e5e64ef9f2ec3bd7"
@@ -29,17 +30,13 @@ EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release "
 EXTRA_OECMAKE += " -DCMAKE_CXX_FLAGS_RELEASE=-O2 "
 
 EXTRA_OECMAKE += " -DCMAKE_CXX_FLAGS='-I${RECIPE_SYSROOT}/usr/include/level_zero'"
+EXTRA_OECMAKE += " -DCMAKE_INSTALL_FIRMWARE_DIR=${nonarch_base_libdir}"
 
 DEPENDS = "level-zero dpkg-native pkgconfig-native"
 
-do_install() {
-    install -d ${D}${base_libdir}/firmware/updates/intel/vpu
-    install -m 0644 ${S}/firmware/bin/*.bin ${D}${base_libdir}/firmware/updates/intel/vpu
-}
-
 PACKAGES =+ "${PN}-firmware ${PN}-tests"
 
-FILES:${PN}-firmware = "${base_libdir}/firmware/updates/intel/vpu/*"
+FILES:${PN}-firmware = "${nonarch_base_libdir}/firmware/updates/intel/vpu/*"
 FILES:${PN}-tests = "${bindir}"
 
 INSANE_SKIP:${PN} += "buildpaths"