sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

(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>
This commit is contained in:
Laurentiu Palcu 2014-02-12 16:33:44 +02:00 committed by Richard Purdie
parent 0fc98a618e
commit e091548568
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/image.bbclass
View File

@ -264,7 +264,7 @@ insert_feed_uris () {
done 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_CHECK_FILE = "${WORKDIR}/multilib_check.py"
MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib" MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"

2
meta/classes/rootfs_ipk.bbclass
View File

@ -21,7 +21,7 @@ OPKG_POSTPROCESS_COMMANDS = ""
OPKGLIBDIR = "${localstatedir}/lib" OPKGLIBDIR = "${localstatedir}/lib"
MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg" MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"
python () { python () {

4
meta/lib/oe/rootfs.py
View File

@ -496,7 +496,9 @@ class OpkgRootfs(Rootfs):
if allow_rep.match(key): if allow_rep.match(key):
valid = True valid = True
else: 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 valid = False
bb.fatal("%s duplicate files %s %s is not the same\n" % bb.fatal("%s duplicate files %s %s is not the same\n" %
(error_prompt, item, files[key])) (error_prompt, item, files[key]))