summaryrefslogtreecommitdiffstats
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:50 +0100
commitb96f0217e408700e4b0ce270d3b0322b5d5a9863 (patch)
treee1e907abc90ee0196d0de85371ab1caac840bc03
parent337de046c8144b2fbcd7799a11828dc3eb34b839 (diff)
downloadpoky-b96f0217e408700e4b0ce270d3b0322b5d5a9863.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) (From OE-Core rev: a2c026cf565897e4b0ba4c31c8762b41361649f4) 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() {
410 done 410 done
411} 411}
412 412
413MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|" 413MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|/lib/modules/[^/]*/modules.*|"
414MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py" 414MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
415MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib" 415MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
416 416