[oe-commits] Paul Eggleton : classes/image: ignore modules.* changing during multilib image construction

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dora
Commit: a2c026cf565897e4b0ba4c31c8762b41361649f4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a2c026cf565897e4b0ba4c31c8762b41361649f4

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Mar 21 18:02:39 2014 +0000

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)

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 0986858..aaaa224 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"