[oe-commits] Laurentiu Palcu : (image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes
git at git.openembedded.org
git at git.openembedded.org
Thu Feb 13 11:35:53 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 4615ac771175cd413f461c081f7d3191c49ccc4b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4615ac771175cd413f461c081f7d3191c49ccc4b
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Wed Feb 12 16:33:44 2014 +0200
(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.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/image.bbclass | 2 +-
meta/classes/rootfs_ipk.bbclass | 2 +-
meta/lib/oe/rootfs.py | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8f4be13..28b68f9 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -264,7 +264,7 @@ insert_feed_uris () {
done
}
-MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|"
+MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|"
MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 6d4f9fa..1887dd3 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -21,7 +21,7 @@ OPKG_POSTPROCESS_COMMANDS = ""
OPKGLIBDIR = "${localstatedir}/lib"
-MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg"
+MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"
python () {
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index b6baf77..4fd17de 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]))
More information about the Openembedded-commits
mailing list