From e0915485681d00528f94acdae036b23428e8ef15 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 12 Feb 2014 16:33:44 +0200 Subject: (image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes This commit whitelists some common directories, so the multilib sanity checks pass and also fixes an issue in lib/oe/rootfs.py when the compared files do not exist. (From OE-Core rev: 4615ac771175cd413f461c081f7d3191c49ccc4b) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index b6baf7780d..4fd17de58e 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -496,7 +496,9 @@ class OpkgRootfs(Rootfs): if allow_rep.match(key): valid = True else: - if not filecmp.cmp(files[key], item): + if os.path.exists(files[key]) and \ + os.path.exists(item) and \ + not filecmp.cmp(files[key], item): valid = False bb.fatal("%s duplicate files %s %s is not the same\n" % (error_prompt, item, files[key])) -- cgit v1.2.3-54-g00ecf