[v3,2/2] classes/image: ignore modules.dep changing during multilib image construction

Submitted by Paul Eggleton on March 21, 2014, 6:02 p.m.

Details

Message ID f999386e60257b66eb79f2e7be6efdddcef28499.1395424859.git.paul.eggleton@linux.intel.com
State New
Headers show

Commit Message

Paul Eggleton March 21, 2014, 6:02 p.m.
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 this file different 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.

Related to fix for [YOCTO #5392].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 3436624..9fe2786 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.dep|"
 MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
 MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"