From eb8e3bf6debf6413d7f87e78b3b5df1438e7a4be Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Mon, 13 May 2024 13:46:06 +0200 Subject: ppfe-firmware: Respect nonarch_base_libdir Fixes QA error: QA Issue: ppfe-firmware package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] Signed-off-by: Alexander Stein --- recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb index c01bfd4c..bb542e8c 100644 --- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb +++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb @@ -13,10 +13,10 @@ SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234" S = "${WORKDIR}/git" do_install () { - install -d ${D}/lib/firmware + install -d ${D}${nonarch_base_libdir}/firmware install -d ${D}/boot/engine-pfe-bin - install -m 644 ${S}/NXP-Binary-EULA.txt ${D}/lib/firmware - install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}/lib/firmware + install -m 644 ${S}/NXP-Binary-EULA.txt ${D}${nonarch_base_libdir}/firmware + install -m 755 ${S}/ls1012a/slow_path/*.elf ${D}${nonarch_base_libdir}/firmware install -m 755 ${S}/ls1012a/u-boot/* ${D}/boot/engine-pfe-bin } @@ -27,7 +27,7 @@ do_deploy () { addtask deploy after do_install -FILES:${PN} += "/lib/firmware /boot/" +FILES:${PN} += "${nonarch_base_libdir}/firmware /boot/" INSANE_SKIP:${PN} += "arch already-stripped" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" -- cgit v1.2.3-54-g00ecf