summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/lib/oe/rootfs.py4
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8f4be13796..28b68f94f2 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -264,7 +264,7 @@ insert_feed_uris () {
264 done 264 done
265} 265}
266 266
267MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|" 267MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|"
268MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py" 268MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
269MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib" 269MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
270 270
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 6d4f9facc0..1887dd3565 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -21,7 +21,7 @@ OPKG_POSTPROCESS_COMMANDS = ""
21 21
22OPKGLIBDIR = "${localstatedir}/lib" 22OPKGLIBDIR = "${localstatedir}/lib"
23 23
24MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg" 24MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"
25 25
26python () { 26python () {
27 27
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]))