From 5c0a8c00405a7a65c51c37256a294cd0683b48d1 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 12 Jul 2022 18:03:43 +0200
Subject: [PATCH] meta-digi-arm: update/refresh fsl-eula classes from meta-imx

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/classes/fsl-eula2-unpack2.bbclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass b/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass
index 1f9964c52..6fe5b7e86 100644
--- a/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass
+++ b/meta-digi-arm/classes/fsl-eula2-unpack2.bbclass
@@ -23,9 +23,15 @@ SCR = "SCR.txt"
 do_install () {
     install -d ${D}${D_SUBDIR}
     cp -r ${S}/* ${D}${D_SUBDIR}
-    if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then
+
+    # Adjust for multilib
+    if [ "${base_libdir}" != "/lib" ] && [ -d "${D}/lib" ]; then
+        mv ${D}/lib ${D}${base_libdir}
+    fi
+    if [ "${libdir}" != "/usr/lib" ] && [ -d "${D}/usr/lib" ]; then
         mv ${D}/usr/lib ${D}${libdir}
     fi
+
     rm ${D}${D_SUBDIR}/COPYING
     if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then
         bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\""