[oe-commits] Mark Hatle : package_ipk: SDK generation workaround
git version control
git at git.openembedded.org
Tue Aug 2 13:33:00 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 0611cceca1595ea4656ebcb985cbd92bb9774ec8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0611cceca1595ea4656ebcb985cbd92bb9774ec8
Author: Mark Hatle <mark.hatle at windriver.com>
Date: Mon Aug 1 18:58:36 2011 -0500
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 at windriver.com>
---
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 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}
More information about the Openembedded-commits
mailing list