summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-08-01 18:58:36 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-02 14:32:11 +0100
commitbb5a3ff0b0331655b44f41d7ca3f8d13066fb083 (patch)
treedd7befb3eed80fe5bc2830311cba0fa4ba7aac55
parent06d4cf01ffff6b358c7dc9f4434aae2714496fd8 (diff)
downloadpoky-bb5a3ff0b0331655b44f41d7ca3f8d13066fb083.tar.gz
poky-bb5a3ff0b0331655b44f41d7ca3f8d13066fb083.tar.bz2
poky-bb5a3ff0b0331655b44f41d7ca3f8d13066fb083.zip
package_ipk: SDK generation workaround
During SDK generation the multilib_sanity_check function is being called, however it is not available unless we've been called from the image.bbclass. Disable the check if MULTILIB_CHECK_FILE (also set in image.bbclass) doesn't exist or is empty. (From OE-Core rev: 0611cceca1595ea4656ebcb985cbd92bb9774ec8) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_ipk.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 3768889e1a..8ecf5111a8 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -127,8 +127,10 @@ package_install_internal_ipk() {
fi
package_tryout_install_multilib_ipk
- #sanity check
- multilib_sanity_check ${target_rootfs} ${multilib_tryout_dirs}|| exit 1
+ if [ ! -z "${MULTILIB_CHECK_FILE}" ]; then
+ #sanity check
+ multilib_sanity_check ${target_rootfs} ${multilib_tryout_dirs} || exit 1
+ fi
if [ ! -z "${package_multilib}" ]; then
opkg-cl ${ipkg_args} install ${package_multilib}