From bb5a3ff0b0331655b44f41d7ca3f8d13066fb083 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 1 Aug 2011 18:58:36 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/classes/package_ipk.bbclass') 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} -- cgit v1.2.3-54-g00ecf