diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-08-01 18:58:36 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-02 14:32:04 +0100 |
| commit | 0611cceca1595ea4656ebcb985cbd92bb9774ec8 (patch) | |
| tree | 7184b8c1eca4c6bc1bb92359d39e650926724f70 | |
| parent | 3c78da15457d8d20c9964cd845f6e021d442aaae (diff) | |
| download | openembedded-core-0611cceca1595ea4656ebcb985cbd92bb9774ec8.tar.gz openembedded-core-0611cceca1595ea4656ebcb985cbd92bb9774ec8.tar.bz2 openembedded-core-0611cceca1595ea4656ebcb985cbd92bb9774ec8.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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 6 |
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} |