Browse Source

Modify populate_ SDK compilation error. Error message:
"nativesdk-gio-querymodules: Invalid ELF image for this architecture"

tianshuliang 3 years ago
parent
commit
bd67d02747

+ 12 - 11
meta/classes/gio-module-cache.bbclass

@@ -4,17 +4,18 @@ inherit qemu
 GIO_MODULE_PACKAGES ??= "${PN}"
 
 gio_module_cache_common() {
-if [ "x$D" != "x" ]; then
-    $INTERCEPT_DIR/postinst_intercept update_gio_module_cache ${PKG} \
-            mlprefix=${MLPREFIX} \
-            binprefix=${MLPREFIX} \
-            libdir=${libdir} \
-            libexecdir=${libexecdir} \
-            base_libdir=${base_libdir} \
-            bindir=${bindir}
-else
-    ${libexecdir}/${MLPREFIX}gio-querymodules ${libdir}/gio/modules/
-fi
+#if [ "x$D" != "x" ]; then
+#    $INTERCEPT_DIR/postinst_intercept update_gio_module_cache ${PKG} \
+#            mlprefix=${MLPREFIX} \
+#            binprefix=${MLPREFIX} \
+#            libdir=${libdir} \
+#            libexecdir=${libexecdir} \
+#            base_libdir=${base_libdir} \
+#            bindir=${bindir}
+#else
+#    ${libexecdir}/${MLPREFIX}gio-querymodules ${libdir}/gio/modules/
+#fi
+echo "dddd"
 }
 
 python populate_packages_append () {

+ 2 - 1
meta/recipes-core/glib-2.0/glib.inc

@@ -58,7 +58,8 @@ do_configure_prepend() {
 
 FILES_${PN} = "${libdir}/lib*${SOLIBS} \
                ${libdir}/gio \
-               ${libexecdir}/*gio-querymodules \
+               ${libexecdir} \
+               gio-querymodules \
                ${datadir}/glib-2.0/schemas"
 
 FILES_${PN}-utils += "${bindir}/glib-genmarshal \

+ 2 - 0
meta/recipes-devtools/gcc/gcc-10.2.inc

@@ -13,6 +13,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
 DEPENDS =+ "mpfr gmp libmpc zlib flex-native"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native"
 
+INSANE_SKIP_${PN} += "installed-vs-shipped"
+
 LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
 
 LIC_FILES_CHKSUM = "\

+ 2 - 0
meta/recipes-devtools/gcc/gcc_10.2.bb

@@ -12,3 +12,5 @@ ARMFPARCHEXT_armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
 ARMFPARCHEXT_armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
 
 BBCLASSEXTEND = "nativesdk"
+
+INSANE_SKIP_${PN} += "installed-vs-shipped"