Patchwork [4/5] package_ipk: SDK generation workaround

login
register
mail settings
Submitter Mark Hatle
Date Aug. 2, 2011, 12:17 a.m.
Message ID <82c3b4ef661c4df6a6df45692d9587fd31bda589.1312243899.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/9024/
State New, archived
Headers show

Comments

Mark Hatle - Aug. 2, 2011, 12:17 a.m.
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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 3768889..8ecf511 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}