]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_ipk: SDK generation workaround
authorMark Hatle <mark.hatle@windriver.com>
Mon, 1 Aug 2011 23:58:36 +0000 (18:58 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 2 Aug 2011 13:32:04 +0000 (14:32 +0100)
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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
meta/classes/package_ipk.bbclass

index 3768889e1a18a0fa0a16e42b88aca7b4b6ba0777..8ecf5111a851b81266b7c2704c13440c319e4c86 100644 (file)
@@ -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}