aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-21 18:02:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-11 12:02:01 +0100
commita2c026cf565897e4b0ba4c31c8762b41361649f4 (patch)
treeb3c0b3687e7b50c2f98176d2c8290c3cf76d83fe
parentac92a5ab25ddfd8462c43bac6f93730b1e454a4f (diff)
downloadopenembedded-core-contrib-a2c026cf565897e4b0ba4c31c8762b41361649f4.tar.gz
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
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"