vdu-firmware: Fix QA error

Fixes:
  ERROR: vdu-firmware-1.0.0-xilinx-v2023.2+git-r0 do_package_qa: QA Issue: vdu-firmware package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge]

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 4 insertions, 6 deletions

diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
index 8cc2cce1..419dd681 100755
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.1.bb
@@ -25,7 +25,7 @@ COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
 COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
 
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/lib/firmware"
+EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
 do_compile[noexec] = "1"
 do_install[dirs] = "${S}"
@@ -33,8 +33,7 @@ do_install[dirs] = "${S}"
 # Inhibit warnings about files being stripped
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "/lib/firmware/*"
-
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
 
 # These libraries shouldn't get installed in world builds unless something
 # explicitly depends upon them.
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
index e9ef222b..ade73a4e 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_2023.2.bb
@@ -25,7 +25,7 @@ COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
 COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge"
 
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-EXTRA_OEMAKE +="INSTALL_PATH=${D}/lib/firmware"
+EXTRA_OEMAKE +="INSTALL_PATH=${D}/${nonarch_base_libdir}/firmware"
 
 do_compile[noexec] = "1"
 do_install[dirs] = "${S}"
@@ -33,8 +33,7 @@ do_install[dirs] = "${S}"
 # Inhibit warnings about files being stripped
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
-FILES:${PN} = "/lib/firmware/*"
-
+FILES:${PN} = "${nonarch_base_libdir}/firmware/*"
 
 # These libraries shouldn't get installed in world builds unless something
 # explicitly depends upon them.