From b96f0217e408700e4b0ce270d3b0322b5d5a9863 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 21 Mar 2014 18:02:39 +0000 Subject: [PATCH] classes/image: ignore modules.* changing during multilib image construction Since we now run depmod when building images (as the postinst that does this is now on kernel-base instead of kernel-image) it is possible to have module file differences between the two halves of the multilib image, and the code that checks for such differences detects this and fails. Whitelist this file to avoid the failure. Specifically, modules.alias, modules.dep and modules.symbol can differ along with their .bin counterparts. Related to fix for [YOCTO #5392]. (From OE-Core master rev: 0a315804bf991664c0948e3024b8e8b9e9085808) (From OE-Core rev: a2c026cf565897e4b0ba4c31c8762b41361649f4) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0986858b48..aaaa2241a1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -410,7 +410,7 @@ log_check() { done } -MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|" +MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|/lib/modules/[^/]*/modules.*|" MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py" MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"