diff mbox series

[v9,3/3] image.bbclass: Add glib-2.0/schemas to MULTILIBRE_ALLOW_REP

Message ID 20231122063119.3620722-3-raj.khem@gmail.com
State New
Headers show
Series [v9,1/3] vte: upgrade 2.72.2 -> 2.74.0 | expand

Commit Message

Khem Raj Nov. 22, 2023, 6:31 a.m. UTC 
This helps in allowing duplicate files for glib-2.0 schemas

Fixes
ERROR: core-image-sato-1.0-r0 do_rootfs: Multilib check error: duplicate files /mnt/b/yoe/master/build/tmp/work/qemux86_64-yoe-linux/core-image-sato/1.0/multilib/lib32/usr/share/glib-2.0/schemas/gschemas.compiled /mnt/b/yo
e/master/build/tmp/work/qemux86_64-yoe-linux/core-image-sato/1.0/rootfs/usr/share/glib-2.0/schemas/gschemas.compiled is not the same

[YOCTO #15291]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ross Burton <ross.burton@arm.com>
---
v9: Rebased

 meta/classes-recipe/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
index 7231fad940d..ace0441adbd 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -609,7 +609,7 @@  python create_symlinks() {
             bb.note("Skipping symlink, source does not exist: %s -> %s" % (dst, src))
 }
 
-MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|"
+MULTILIBRE_ALLOW_REP =. "${datadir}/glib-2.0/schemas|{base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|"
 MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
 MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"