From: Mark Hatle <mark.hatle@windriver.com>
Date: Mon, 1 Aug 2011 23:58:36 +0000 (-0500)
Subject: package_ipk: SDK generation workaround
X-Git-Tag: 2011-1~509
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0611cceca1595ea4656ebcb985cbd92bb9774ec8;p=openembedded-core.git

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>
---

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}