diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-02-12 16:33:44 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-13 11:41:22 +0000 |
| commit | e0915485681d00528f94acdae036b23428e8ef15 (patch) | |
| tree | a0bcefd82f03eef3cd63c082dd6615337a2fd5cf | |
| parent | 0fc98a618ec13c07c247bfdb368a89d66d1704b6 (diff) | |
| download | ast2050-yocto-poky-e0915485681d00528f94acdae036b23428e8ef15.zip ast2050-yocto-poky-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>
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 2 | ||||
| -rw-r--r-- | 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])) |
