[OE-core] [PATCH] glib-2.0: fix install error for multilib

Chen Qi Qi.Chen at windriver.com
Tue Mar 17 03:28:43 UTC 2020


A previous patch adds this `mv' command, but patch file, static-link.test
might not even be there. So add a check to avoid do_install error in case
of multilib.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index edecc51fdb..4f99b86569 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -129,7 +129,9 @@ do_install_append_class-target () {
 		fi
 	fi
         if test "x${MLPREFIX}" != "x"; then
-                mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+                if [ -e ${D}${datadir}/installed-tests/glib/static-link.test ]; then
+                        mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+                fi
         fi
 }
 
-- 
2.21.0



More information about the Openembedded-core mailing list