MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-04 20:54:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux-npu-driver : fix multilib install issue

Browse Source 
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>
This commit is contained in:
Yogesh Tyagi 2025-05-28 16:01:39 +08:00 committed by Anuj Mittal
parent 6dc5579712
commit 5640f6592c
No known key found for this signature in database
GPG Key ID: B749E1556041E1B2
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch Normal file
View File

@ -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

9
dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.17.0.bb
View File

@ -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"