diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-03-21 18:02:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-22 12:12:20 +0000 |
| commit | 004f9be18abc89e6262318a39d2fae5beb854656 (patch) | |
| tree | 86cfc9761c8eaccc46ac94a40a19593a48f1696f /meta/classes/image.bbclass | |
| parent | 9ce1f7d522aac19e0f88ae4f4066aee89c2ac678 (diff) | |
| download | ast2050-yocto-poky-004f9be18abc89e6262318a39d2fae5beb854656.zip ast2050-yocto-poky-004f9be18abc89e6262318a39d2fae5beb854656.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 rev: 0a315804bf991664c0948e3024b8e8b9e9085808)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3436624..b0639ae 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -269,7 +269,7 @@ insert_feed_uris () { done } -MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|" +MULTILIBRE_ALLOW_REP =. "${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" |
