summaryrefslogtreecommitdiffstats
path: root/meta/classes
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/classes
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/classes')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
2 files changed, 2 insertions, 2 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