summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-02-12 16:33:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-13 11:41:22 +0000
commite0915485681d00528f94acdae036b23428e8ef15 (patch)
treea0bcefd82f03eef3cd63c082dd6615337a2fd5cf /meta/lib/oe
parent0fc98a618ec13c07c247bfdb368a89d66d1704b6 (diff)
downloadpoky-e0915485681d00528f94acdae036b23428e8ef15.tar.gz
(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 <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 3 insertions, 1 deletions
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):
496 if allow_rep.match(key): 496 if allow_rep.match(key):
497 valid = True 497 valid = True
498 else: 498 else:
499 if not filecmp.cmp(files[key], item): 499 if os.path.exists(files[key]) and \
500 os.path.exists(item) and \
501 not filecmp.cmp(files[key], item):
500 valid = False 502 valid = False
501 bb.fatal("%s duplicate files %s %s is not the same\n" % 503 bb.fatal("%s duplicate files %s %s is not the same\n" %
502 (error_prompt, item, files[key])) 504 (error_prompt, item, files[key]))